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/frv/kernel | |
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/frv/kernel')
-rw-r--r-- | arch/frv/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c index a8c61dac1cee..1a5eb6c301c9 100644 --- a/arch/frv/kernel/setup.c +++ b/arch/frv/kernel/setup.c | |||
@@ -947,7 +947,7 @@ static void __init setup_linux_memory(void) | |||
947 | if (LOADER_TYPE && INITRD_START) { | 947 | if (LOADER_TYPE && INITRD_START) { |
948 | if (INITRD_START + INITRD_SIZE <= (low_top_pfn << PAGE_SHIFT)) { | 948 | if (INITRD_START + INITRD_SIZE <= (low_top_pfn << PAGE_SHIFT)) { |
949 | reserve_bootmem(INITRD_START, INITRD_SIZE); | 949 | reserve_bootmem(INITRD_START, INITRD_SIZE); |
950 | initrd_start = INITRD_START ? INITRD_START + PAGE_OFFSET : 0; | 950 | initrd_start = INITRD_START + PAGE_OFFSET; |
951 | initrd_end = initrd_start + INITRD_SIZE; | 951 | initrd_end = initrd_start + INITRD_SIZE; |
952 | } | 952 | } |
953 | else { | 953 | else { |