Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 19e5d9c0d2194b4b47189cbec2921cbf72b0bd1c

Authored by Henry Nestler
Committed by Linus Torvalds
1 parent 319e799abb

[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>

Showing 7 changed files with 7 additions and 16 deletions Side-by-side Diff

arch/frv/kernel/setup.c
Diff comments   View file @ 19e5d9c
... ... @@ -947,7 +947,7 @@
947 947 if (LOADER_TYPE && INITRD_START) {
948 948 if (INITRD_START + INITRD_SIZE <= (low_top_pfn << PAGE_SHIFT)) {
949 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 951 initrd_end = initrd_start + INITRD_SIZE;
952 952 }
953 953 else {
arch/i386/kernel/setup.c
Diff comments   View file @ 19e5d9c
... ... @@ -1162,8 +1162,7 @@
1162 1162 if (LOADER_TYPE && INITRD_START) {
1163 1163 if (INITRD_START + INITRD_SIZE <= (max_low_pfn << PAGE_SHIFT)) {
1164 1164 reserve_bootmem(INITRD_START, INITRD_SIZE);
1165   - initrd_start =
1166   - INITRD_START ? INITRD_START + PAGE_OFFSET : 0;
  1165 + initrd_start = INITRD_START + PAGE_OFFSET;
1167 1166 initrd_end = initrd_start+INITRD_SIZE;
1168 1167 }
1169 1168 else {
arch/m32r/kernel/setup.c
Diff comments   View file @ 19e5d9c
... ... @@ -196,9 +196,7 @@
196 196 if (LOADER_TYPE && INITRD_START) {
197 197 if (INITRD_START + INITRD_SIZE <= (max_low_pfn << PAGE_SHIFT)) {
198 198 reserve_bootmem(INITRD_START, INITRD_SIZE);
199   - initrd_start = INITRD_START ?
200   - INITRD_START + PAGE_OFFSET : 0;
201   -
  199 + initrd_start = INITRD_START + PAGE_OFFSET;
202 200 initrd_end = initrd_start + INITRD_SIZE;
203 201 printk("initrd:start[%08lx],size[%08lx]\n",
204 202 initrd_start, INITRD_SIZE);
arch/m32r/mm/discontig.c
Diff comments   View file @ 19e5d9c
... ... @@ -105,9 +105,7 @@
105 105 if (INITRD_START + INITRD_SIZE <= PFN_PHYS(max_low_pfn)) {
106 106 reserve_bootmem_node(NODE_DATA(0), INITRD_START,
107 107 INITRD_SIZE);
108   - initrd_start = INITRD_START ?
109   - INITRD_START + PAGE_OFFSET : 0;
110   -
  108 + initrd_start = INITRD_START + PAGE_OFFSET;
111 109 initrd_end = initrd_start + INITRD_SIZE;
112 110 printk("initrd:start[%08lx],size[%08lx]\n",
113 111 initrd_start, INITRD_SIZE);
arch/sh/kernel/setup.c
Diff comments   View file @ 19e5d9c
... ... @@ -332,8 +332,7 @@
332 332 if (LOADER_TYPE && INITRD_START) {
333 333 if (INITRD_START + INITRD_SIZE <= (max_low_pfn << PAGE_SHIFT)) {
334 334 reserve_bootmem_node(NODE_DATA(0), INITRD_START+__MEMORY_START, INITRD_SIZE);
335   - initrd_start =
336   - INITRD_START ? INITRD_START + PAGE_OFFSET + __MEMORY_START : 0;
  335 + initrd_start = INITRD_START + PAGE_OFFSET + __MEMORY_START;
337 336 initrd_end = initrd_start + INITRD_SIZE;
338 337 } else {
339 338 printk("initrd extends beyond end of memory "
arch/sh64/kernel/setup.c
Diff comments   View file @ 19e5d9c
... ... @@ -243,9 +243,7 @@
243 243 if (INITRD_START + INITRD_SIZE <= (PFN_PHYS(last_pfn))) {
244 244 reserve_bootmem_node(NODE_DATA(0), INITRD_START + __MEMORY_START, INITRD_SIZE);
245 245  
246   - initrd_start =
247   - (long) INITRD_START ? INITRD_START + PAGE_OFFSET + __MEMORY_START : 0;
248   -
  246 + initrd_start = (long) INITRD_START + PAGE_OFFSET + __MEMORY_START;
249 247 initrd_end = initrd_start + INITRD_SIZE;
250 248 } else {
251 249 printk("initrd extends beyond end of memory "
arch/x86_64/kernel/setup.c
Diff comments   View file @ 19e5d9c
... ... @@ -471,8 +471,7 @@
471 471 if (LOADER_TYPE && INITRD_START) {
472 472 if (INITRD_START + INITRD_SIZE <= (end_pfn << PAGE_SHIFT)) {
473 473 reserve_bootmem_generic(INITRD_START, INITRD_SIZE);
474   - initrd_start =
475   - INITRD_START ? INITRD_START + PAGE_OFFSET : 0;
  474 + initrd_start = INITRD_START + PAGE_OFFSET;
476 475 initrd_end = initrd_start+INITRD_SIZE;
477 476 }
478 477 else {