summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-16 20:33:09 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-16 20:33:09 +0100
commitf74e6670c4a788c9a0c52ab2036d8ac6be12f1d8 (patch)
treed11599cff4ef51e6e98d3e132b561d00f3e40204
parent[PATCH] x86_64: Increase NR_IRQ_VECTORS to 32 * NR_CPUS (diff)
downloadlinux-f74e6670c4a788c9a0c52ab2036d8ac6be12f1d8.tar.xz
linux-f74e6670c4a788c9a0c52ab2036d8ac6be12f1d8.zip
x86-64: fix initrd freeing
The comparison of the initrd start address against "&_end" is unnecessary and incorrect. Make it match the x86 code that just compares the passed-in arguments. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/x86_64/mm/init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c
index ef84106c1509..307d1ac0ef33 100644
--- a/arch/x86_64/mm/init.c
+++ b/arch/x86_64/mm/init.c
@@ -531,7 +531,7 @@ void mark_rodata_ro(void)
#ifdef CONFIG_BLK_DEV_INITRD
void free_initrd_mem(unsigned long start, unsigned long end)
{
- if (start < (unsigned long)&_end)
+ if (start >= end)
return;
printk ("Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
for (; start < end; start += PAGE_SIZE) {