diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-09-09 09:00:50 +0200 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-11-26 11:09:11 +0100 |
| commit | 29a202035753dd0e5810caaefe885ed8934bfd46 (patch) | |
| tree | 971426ad2825e009e0570d055ed05e26519ec305 /arch | |
| parent | b3ce71720560a9125aa0343bdbf501d887dbfb74 (diff) | |
| download | linux-29a202035753dd0e5810caaefe885ed8934bfd46.tar.bz2 | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68k/include/asm/bootinfo.h | 2 | ||||
| -rw-r--r-- | arch/m68k/kernel/head.S | 2 | ||||
| -rw-r--r-- | 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 67e7a78ad96b..fbb6150f00f3 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 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) 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); |