Commit 19e5d9c0 authored by Henry Nestler's avatar Henry Nestler Committed by Linus Torvalds
Browse files

[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: default avatarHenry Nestler <henry.ne@arcor.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 319e799a

arch/frv/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -947,7 +947,7 @@ static void __init setup_linux_memory(void) 
	if (LOADER_TYPE && INITRD_START) {

		if (INITRD_START + INITRD_SIZE <= (low_top_pfn << PAGE_SHIFT)) {

			reserve_bootmem(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;

		}

		else {

arch/i386/kernel/setup.c

+1 −2
Original line number Diff line number Diff line
@@ -1162,8 +1162,7 @@ void __init setup_bootmem_allocator(void) 
	if (LOADER_TYPE && INITRD_START) {

		if (INITRD_START + INITRD_SIZE <= (max_low_pfn << PAGE_SHIFT)) {

			reserve_bootmem(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;

		}

		else {

arch/m32r/kernel/setup.c

+1 −3
Original line number Diff line number Diff line
@@ -196,9 +196,7 @@ static unsigned long __init setup_memory(void) 
	if (LOADER_TYPE && INITRD_START) {

		if (INITRD_START + INITRD_SIZE <= (max_low_pfn << PAGE_SHIFT)) {

			reserve_bootmem(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);

arch/m32r/mm/discontig.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

arch/sh/kernel/setup.c

+1 −2
Original line number Diff line number Diff line
@@ -332,8 +332,7 @@ void __init setup_arch(char **cmdline_p) 
	if (LOADER_TYPE && INITRD_START) {

		if (INITRD_START + INITRD_SIZE <= (max_low_pfn << PAGE_SHIFT)) {

			reserve_bootmem_node(NODE_DATA(0), INITRD_START+__MEMORY_START, INITRD_SIZE);

			initrd_start =

				INITRD_START ? INITRD_START + PAGE_OFFSET + __MEMORY_START : 0;

			initrd_start = INITRD_START + PAGE_OFFSET + __MEMORY_START;

			initrd_end = initrd_start + INITRD_SIZE;

		} else {

			printk("initrd extends beyond end of memory "