diff options
author | Henry Nestler <henry.ne@arcor.de> | 2006-12-06 23:37:45 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:38 -0500 |
commit | 19e5d9c0d2194b4b47189cbec2921cbf72b0bd1c (patch) | |
tree | 1d0c9ed041ab887bfc73577141c27948891a33c5 /arch/m32r/kernel/setup.c | |
parent | 319e799abb89d9215a203e32c2cad51115d302f4 (diff) |
[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/kernel/setup.c')
-rw-r--r-- | arch/m32r/kernel/setup.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/m32r/kernel/setup.c b/arch/m32r/kernel/setup.c index 0e7778be33cc..936205f7aba0 100644 --- a/arch/m32r/kernel/setup.c +++ b/arch/m32r/kernel/setup.c | |||
@@ -196,9 +196,7 @@ static unsigned long __init setup_memory(void) | |||
196 | if (LOADER_TYPE && INITRD_START) { | 196 | if (LOADER_TYPE && INITRD_START) { |
197 | if (INITRD_START + INITRD_SIZE <= (max_low_pfn << PAGE_SHIFT)) { | 197 | if (INITRD_START + INITRD_SIZE <= (max_low_pfn << PAGE_SHIFT)) { |
198 | reserve_bootmem(INITRD_START, INITRD_SIZE); | 198 | reserve_bootmem(INITRD_START, INITRD_SIZE); |
199 | initrd_start = INITRD_START ? | 199 | initrd_start = INITRD_START + PAGE_OFFSET; |
200 | INITRD_START + PAGE_OFFSET : 0; | ||
201 | |||
202 | initrd_end = initrd_start + INITRD_SIZE; | 200 | initrd_end = initrd_start + INITRD_SIZE; |
203 | printk("initrd:start[%08lx],size[%08lx]\n", | 201 | printk("initrd:start[%08lx],size[%08lx]\n", |
204 | initrd_start, INITRD_SIZE); | 202 | initrd_start, INITRD_SIZE); |