aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/lguest
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-08-20 04:19:54 -0400
committerThomas Gleixner <tglx@linutronix.de>2009-08-27 11:12:52 -0400
commit6b18ae3e2ff62daa9f181401759161dd8de0aadf (patch)
tree3e1c61c26c29a1a81d5f54917a92c37334d3c607 /arch/x86/lguest
parent816c25e7d4fb6fd40022a376e8b7f45b1edf5a89 (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/lguest')
-rw-r--r--arch/x86/lguest/boot.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
index d677fa9ca650..11445c176de6 100644
--- a/arch/x86/lguest/boot.c
+++ b/arch/x86/lguest/boot.c
@@ -1270,7 +1270,6 @@ __init void lguest_init(void)
1270 pv_irq_ops.safe_halt = lguest_safe_halt; 1270 pv_irq_ops.safe_halt = lguest_safe_halt;
1271 1271
1272 /* Setup operations */ 1272 /* Setup operations */
1273 pv_init_ops.memory_setup = lguest_memory_setup;
1274 pv_init_ops.patch = lguest_patch; 1273 pv_init_ops.patch = lguest_patch;
1275 1274
1276 /* Intercepts of various CPU instructions */ 1275 /* Intercepts of various CPU instructions */
@@ -1325,6 +1324,8 @@ __init void lguest_init(void)
1325 pv_time_ops.time_init = lguest_time_init; 1324 pv_time_ops.time_init = lguest_time_init;
1326 pv_time_ops.get_tsc_khz = lguest_tsc_khz; 1325 pv_time_ops.get_tsc_khz = lguest_tsc_khz;
1327 1326
1327 x86_init.resources.memory_setup = lguest_memory_setup;
1328
1328 /* 1329 /*
1329 * Now is a good time to look at the implementations of these functions 1330 * Now is a good time to look at the implementations of these functions
1330 * before returning to the rest of lguest_init(). 1331 * before returning to the rest of lguest_init().