aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2013-09-09 03:00:50 -0400
committerGeert Uytterhoeven <geert@linux-m68k.org>2013-11-26 05:09:11 -0500
commit29a202035753dd0e5810caaefe885ed8934bfd46 (patch)
tree971426ad2825e009e0570d055ed05e26519ec305
parentb3ce71720560a9125aa0343bdbf501d887dbfb74 (diff)
m68k: The bootinfo is located right after the kernel
Since the introduction of init sections (which are located after BSS), the bootinfo is no longer located right after the BSS, but after all kernel sections. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
-rw-r--r--arch/m68k/include/asm/bootinfo.h2
-rw-r--r--arch/m68k/kernel/head.S2
-rw-r--r--arch/m68k/kernel/setup_mm.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68k/include/asm/bootinfo.h b/arch/m68k/include/asm/bootinfo.h
index 67e7a78ad96b..fbb6150f00f3 100644
--- a/arch/m68k/include/asm/bootinfo.h
+++ b/arch/m68k/include/asm/bootinfo.h
@@ -34,7 +34,7 @@
34 * This way I hope to keep all future changes back/forewards compatible. 34 * This way I hope to keep all future changes back/forewards compatible.
35 * Thus, keep your fingers crossed... 35 * Thus, keep your fingers crossed...
36 * 36 *
37 * This structure is copied right after the kernel bss by the bootstrap 37 * This structure is copied right after the kernel by the bootstrap
38 * routine. 38 * routine.
39 */ 39 */
40 40
diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S
index ac85f16534af..fb348caa734e 100644
--- a/arch/m68k/kernel/head.S
+++ b/arch/m68k/kernel/head.S
@@ -1532,7 +1532,7 @@ L(cache_done):
1532 1532
1533/* 1533/*
1534 * Find a tag record in the bootinfo structure 1534 * Find a tag record in the bootinfo structure
1535 * The bootinfo structure is located right after the kernel bss 1535 * The bootinfo structure is located right after the kernel
1536 * Returns: d0: size (-1 if not found) 1536 * Returns: d0: size (-1 if not found)
1537 * a0: data pointer (end-of-records if not found) 1537 * a0: data pointer (end-of-records if not found)
1538 */ 1538 */
diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c
index 9f16a15fa287..18423a843379 100644
--- a/arch/m68k/kernel/setup_mm.c
+++ b/arch/m68k/kernel/setup_mm.c
@@ -220,7 +220,7 @@ void __init setup_arch(char **cmdline_p)
220 int i; 220 int i;
221#endif 221#endif
222 222
223 /* The bootinfo is located right after the kernel bss */ 223 /* The bootinfo is located right after the kernel */
224 if (!CPU_IS_COLDFIRE) 224 if (!CPU_IS_COLDFIRE)
225 m68k_parse_bootinfo((const struct bi_record *)_end); 225 m68k_parse_bootinfo((const struct bi_record *)_end);
226 226