diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-10-02 15:50:56 -0400 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-11-26 05:09:16 -0500 |
commit | 799300840c18e7fdc0a3dace70d9b56a189fd1ab (patch) | |
tree | d26513a11a09c256a9ae62d17c2f656ae9502f01 /arch/m68k/mm/init.c | |
parent | 4c3c522bcebe16a717d7a809fd14b11823794027 (diff) |
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/mm/init.c')
-rw-r--r-- | arch/m68k/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c index 6b4baa6e4d31..acaff6a49e35 100644 --- a/arch/m68k/mm/init.c +++ b/arch/m68k/mm/init.c | |||
@@ -59,7 +59,7 @@ EXPORT_SYMBOL(pg_data_table); | |||
59 | void __init m68k_setup_node(int node) | 59 | void __init m68k_setup_node(int node) |
60 | { | 60 | { |
61 | #ifndef CONFIG_SINGLE_MEMORY_CHUNK | 61 | #ifndef CONFIG_SINGLE_MEMORY_CHUNK |
62 | struct mem_info *info = m68k_memory + node; | 62 | struct m68k_mem_info *info = m68k_memory + node; |
63 | int i, end; | 63 | int i, end; |
64 | 64 | ||
65 | i = (unsigned long)phys_to_virt(info->addr) >> __virt_to_node_shift(); | 65 | i = (unsigned long)phys_to_virt(info->addr) >> __virt_to_node_shift(); |