diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-10-02 21:50:56 +0200 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-11-26 11:09:16 +0100 |
| commit | 799300840c18e7fdc0a3dace70d9b56a189fd1ab (patch) | |
| tree | d26513a11a09c256a9ae62d17c2f656ae9502f01 /arch/m68k/kernel | |
| parent | m68k/UAPI: Disintegrate arch/m68k/include/asm/bootinfo.h (diff) | |
| download | linux-799300840c18e7fdc0a3dace70d9b56a189fd1ab.tar.xz linux-799300840c18e7fdc0a3dace70d9b56a189fd1ab.zip | |
m68k/UAPI: Move generic definitions to <asm/bootinfo.h>
Move generic definitions used by bootstraps to uapi/asm/bootinfo.h:
- Machine types,
- CPU, FPU, and MMU types,
- struct mem_info.
Keep a copy of struct mem_info for in-kernel use, and rename it to struct
m68k_mem_info, as the exported one will be modified later.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/kernel')
| -rw-r--r-- | arch/m68k/kernel/setup_mm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c index 18423a843379..cff9845708c0 100644 --- a/arch/m68k/kernel/setup_mm.c +++ b/arch/m68k/kernel/setup_mm.c @@ -71,10 +71,10 @@ EXPORT_SYMBOL(m68k_num_memory); int m68k_realnum_memory; EXPORT_SYMBOL(m68k_realnum_memory); unsigned long m68k_memoffset; -struct mem_info m68k_memory[NUM_MEMINFO]; +struct m68k_mem_info m68k_memory[NUM_MEMINFO]; EXPORT_SYMBOL(m68k_memory); -static struct mem_info m68k_ramdisk __initdata; +static struct m68k_mem_info m68k_ramdisk __initdata; static char m68k_command_line[CL_SIZE] __initdata; |