Commit2f806e3

authored

Merge pull request#1248 from nicholasbishop/bishop-mmap-drop

boot: Always impl Drop for MemoryMapBackingMemory

2 parents23eb0e8 +ccf9897 commit2f806e3Copy full SHA for 2f806e3

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1737,8 +1737,6 @@ impl MemoryMapBackingMemory {`
`1737`	`1737`	`}`
`1738`	`1738`	`}`
`1739`	`1739`
`1740`		`-// Don't drop when we use this in unit tests.`
`1741`		`-#[cfg(not(test))]`
`1742`	`1740`	`implDropforMemoryMapBackingMemory{`
`1743`	`1741`	`fndrop(&mutself){`
`1744`	`1742`	`ifletSome(bs) =system_table_boot(){`
`@@ -1747,7 +1745,7 @@ impl Drop for MemoryMapBackingMemory {`
`1747`	`1745`	`log::error!("Failed to deallocate memory map: {e:?}");`
`1748`	`1746`	`}`
`1749`	`1747`	`}else{`
`1750`		`- log::debug!("Boot services areexcited. Memory map won't be freed using the UEFI boot services allocator.");`
	`1748`	`+ log::debug!("Boot services areexited. Memory map won't be freed using the UEFI boot services allocator.");`
`1751`	`1749`	`}`
`1752`	`1750`	`}`
`1753`	`1751`	`}`

Comments

(0)