[PATCH 02/16] m68k: The bootinfo is located right after the kernel

Geert Uytterhoeven
2013-10-16T12:31:19Z

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>
---
arch/m68k/include/asm/bootinfo.h | 2 +-
arch/m68k/kernel/head.S | 2 +-
arch/m68k/kernel/setup_mm.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/m68k/include/asm/bootinfo.h b/arch/m68k/include/asm/bootinfo.h
index 3c2da7bd057f..a66a7f9200f7 100644
--- a/arch/m68k/include/asm/bootinfo.h
+++ b/arch/m68k/include/asm/bootinfo.h
@@ -34,7 +34,7 @@
* This way I hope to keep all future changes back/forewards compatible.
* Thus, keep your fingers crossed...
*
- * This structure is copied right after the kernel bss by the bootstrap
+ * This structure is copied right after the kernel by the bootstrap
* routine.
*/

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):

/*
* Find a tag record in the bootinfo structure
- * The bootinfo structure is located right after the kernel bss
+ * The bootinfo structure is located right after the kernel
* Returns: d0: size (-1 if not found)
* a0: data pointer (end-of-records if not found)
*/
diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c
index 2299080d77f2..b979a3781dcb 100644
--- a/arch/m68k/kernel/setup_mm.c
+++ b/arch/m68k/kernel/setup_mm.c
@@ -222,7 +222,7 @@ void __init setup_arch(char **cmdline_p)
int i;
#endif

- /* The bootinfo is located right after the kernel bss */
+ /* The bootinfo is located right after the kernel */
if (!CPU_IS_COLDFIRE)
m68k_parse_bootinfo((const struct bi_record *)_end);

--
1.7.9.5