diff options
| author | Henry Nestler <henry.ne@arcor.de> | 2006-12-07 05:37:45 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 17:39:38 +0100 |
| commit | 19e5d9c0d2194b4b47189cbec2921cbf72b0bd1c (patch) | |
| tree | 1d0c9ed041ab887bfc73577141c27948891a33c5 /arch/sh64 | |
| parent | [PATCH] ver_linux additions (diff) | |
| download | linux-19e5d9c0d2194b4b47189cbec2921cbf72b0bd1c.tar.xz linux-19e5d9c0d2194b4b47189cbec2921cbf72b0bd1c.zip | |
[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/sh64')
| -rw-r--r-- | arch/sh64/kernel/setup.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/sh64/kernel/setup.c b/arch/sh64/kernel/setup.c index ffb310e33cef..b9e7d54d7b85 100644 --- a/arch/sh64/kernel/setup.c +++ b/arch/sh64/kernel/setup.c @@ -243,9 +243,7 @@ void __init setup_arch(char **cmdline_p) if (INITRD_START + INITRD_SIZE <= (PFN_PHYS(last_pfn))) { reserve_bootmem_node(NODE_DATA(0), INITRD_START + __MEMORY_START, INITRD_SIZE); - initrd_start = - (long) INITRD_START ? INITRD_START + PAGE_OFFSET + __MEMORY_START : 0; - + initrd_start = (long) INITRD_START + PAGE_OFFSET + __MEMORY_START; initrd_end = initrd_start + INITRD_SIZE; } else { printk("initrd extends beyond end of memory " |