diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-20 04:19:54 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-27 11:12:52 -0400 |
commit | 6b18ae3e2ff62daa9f181401759161dd8de0aadf (patch) | |
tree | 3e1c61c26c29a1a81d5f54917a92c37334d3c607 /arch/x86/include/asm/setup.h | |
parent | 816c25e7d4fb6fd40022a376e8b7f45b1edf5a89 (diff) |
x86: Move memory_setup to x86_init_ops
memory_setup is overridden by x86_quirks and by paravirts with weak
functions and quirks. Unify the whole mess and make it an
unconditional x86_init_ops function which defaults to the standard
function and can be overridden by the early platform code.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/include/asm/setup.h')
-rw-r--r-- | arch/x86/include/asm/setup.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h index 19769ac60616..9cba9d6ca885 100644 --- a/arch/x86/include/asm/setup.h +++ b/arch/x86/include/asm/setup.h | |||
@@ -22,7 +22,6 @@ struct x86_quirks { | |||
22 | int (*arch_pre_intr_init)(void); | 22 | int (*arch_pre_intr_init)(void); |
23 | int (*arch_intr_init)(void); | 23 | int (*arch_intr_init)(void); |
24 | int (*arch_trap_init)(void); | 24 | int (*arch_trap_init)(void); |
25 | char * (*arch_memory_setup)(void); | ||
26 | int (*mach_get_smp_config)(unsigned int early); | 25 | int (*mach_get_smp_config)(unsigned int early); |
27 | int (*mach_find_smp_config)(unsigned int reserve); | 26 | int (*mach_find_smp_config)(unsigned int reserve); |
28 | 27 | ||