diff options
author | Henry Nestler <henry.ne@arcor.de> | 2006-12-06 20:37:45 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 08:39:38 -0800 |
commit | 19e5d9c0d2194b4b47189cbec2921cbf72b0bd1c (patch) | |
tree | 1d0c9ed041ab887bfc73577141c27948891a33c5 /arch/m32r/mm | |
parent | 319e799abb89d9215a203e32c2cad51115d302f4 (diff) | |
download | kernel_samsung_tuna-19e5d9c0d2194b4b47189cbec2921cbf72b0bd1c.zip kernel_samsung_tuna-19e5d9c0d2194b4b47189cbec2921cbf72b0bd1c.tar.gz kernel_samsung_tuna-19e5d9c0d2194b4b47189cbec2921cbf72b0bd1c.tar.bz2 |
[PATCH] initrd: remove unused false condition for initrd_start
After LOADER_TYPE && INITRD_START are true, the short if-condition
for INITRD_START can never be false.
Remove unused code from the else condition.
Signed-off-by: Henry Nestler <henry.ne@arcor.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/m32r/mm')
-rw-r--r-- | arch/m32r/mm/discontig.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/m32r/mm/discontig.c b/arch/m32r/mm/discontig.c index abb34cc..c7efdb0 100644 --- a/arch/m32r/mm/discontig.c +++ b/arch/m32r/mm/discontig.c @@ -105,9 +105,7 @@ unsigned long __init setup_memory(void) if (INITRD_START + INITRD_SIZE <= PFN_PHYS(max_low_pfn)) { reserve_bootmem_node(NODE_DATA(0), INITRD_START, INITRD_SIZE); - initrd_start = INITRD_START ? - INITRD_START + PAGE_OFFSET : 0; - + initrd_start = INITRD_START + PAGE_OFFSET; initrd_end = initrd_start + INITRD_SIZE; printk("initrd:start[%08lx],size[%08lx]\n", initrd_start, INITRD_SIZE); |