subj: [PATCH] initrd: Remove unused false condition for initrd_start
From: Henry Nestler <[email protected]>
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 <[email protected]>
---
Grepped for all of these code style in all arch and changed here.
arch/frv/kernel/setup.c | 2 +- arch/i386/kernel/setup.c | 3 +-- arch/m32r/kernel/setup.c | 4 +--- arch/m32r/mm/discontig.c | 4 +--- arch/sh/kernel/setup.c | 3 +-- arch/sh64/kernel/setup.c | 4 +--- arch/x86_64/kernel/setup.c | 3 +-- 7 files changed, 7 insertions(+), 16 deletions(-)
arch/frv/kernel/setup.c +1 -1
@@ -947,7 +947,7 @@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
@@ -1162,8 +1162,7 @@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
@@ -196,9 +196,7 @@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
@@ -105,9 +105,7 @@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/sh64/kernel/setup.c +1 -3
@@ -243,9 +243,7 @@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 "
arch/x86_64/kernel/setup.c +1 -2
@@ -471,8 +471,7 @@if (LOADER_TYPE &&INITRD_START ) {if (INITRD_START +INITRD_SIZE <= (end_pfn <<PAGE_SHIFT )) {reserve_bootmem_generic (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/sh/kernel/setup.c +1 -2
@@ -332,8 +332,7 @@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 "
### End of patch. ### Sorry for followed footer from webmailer ###
Viel oder wenig? Schnell oder langsam? Unbegrenzt surfen + telefonieren ohne Zeit- und Volumenbegrenzung? DAS TOP ANGEBOT JETZT bei Arcor: günstig und schnell mit DSL - das All-Inclusive-Paket für clevere Doppel-Sparer, nur 44,85 € inkl. DSL- und ISDN-Grundgebühr!
http://www.arcor.de/rd/emf-dsl-2