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/sh | |
| 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/sh')
| -rw-r--r-- | arch/sh/kernel/setup.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index 696ca75752d9..f8dd6b7bfab0 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c | |||
| @@ -332,8 +332,7 @@ void __init setup_arch(char **cmdline_p) | |||
| 332 | if (LOADER_TYPE && INITRD_START) { | 332 | if (LOADER_TYPE && INITRD_START) { |
| 333 | if (INITRD_START + INITRD_SIZE <= (max_low_pfn << PAGE_SHIFT)) { | 333 | if (INITRD_START + INITRD_SIZE <= (max_low_pfn << PAGE_SHIFT)) { |
| 334 | reserve_bootmem_node(NODE_DATA(0), INITRD_START+__MEMORY_START, INITRD_SIZE); | 334 | reserve_bootmem_node(NODE_DATA(0), INITRD_START+__MEMORY_START, INITRD_SIZE); |
| 335 | initrd_start = | 335 | initrd_start = INITRD_START + PAGE_OFFSET + __MEMORY_START; |
| 336 | INITRD_START ? INITRD_START + PAGE_OFFSET + __MEMORY_START : 0; | ||
| 337 | initrd_end = initrd_start + INITRD_SIZE; | 336 | initrd_end = initrd_start + INITRD_SIZE; |
| 338 | } else { | 337 | } else { |
| 339 | printk("initrd extends beyond end of memory " | 338 | printk("initrd extends beyond end of memory " |