diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-20 10:19:54 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-27 17:12:52 +0200 |
| commit | 6b18ae3e2ff62daa9f181401759161dd8de0aadf (patch) | |
| tree | 3e1c61c26c29a1a81d5f54917a92c37334d3c607 /arch/x86/kernel/paravirt.c | |
| parent | 816c25e7d4fb6fd40022a376e8b7f45b1edf5a89 (diff) | |
| download | linux-stable-6b18ae3e2ff62daa9f181401759161dd8de0aadf.tar.gz linux-stable-6b18ae3e2ff62daa9f181401759161dd8de0aadf.tar.bz2 linux-stable-6b18ae3e2ff62daa9f181401759161dd8de0aadf.zip | |
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/kernel/paravirt.c')
| -rw-r--r-- | arch/x86/kernel/paravirt.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index 70ec9b951d76..532c9a2626c7 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c @@ -60,11 +60,6 @@ static void __init default_banner(void) pv_info.name); } -char *memory_setup(void) -{ - return pv_init_ops.memory_setup(); -} - /* Simple instruction patching code. */ #define DEF_NATIVE(ops, name, code) \ extern const char start_##ops##_##name[], end_##ops##_##name[]; \ @@ -322,7 +317,6 @@ struct pv_init_ops pv_init_ops = { .patch = native_patch, .banner = default_banner, .arch_setup = paravirt_nop, - .memory_setup = machine_specific_memory_setup, }; struct pv_time_ops pv_time_ops = { |