diff options
| author | Ian Campbell <ian.campbell@xensource.com> | 2007-03-30 14:13:53 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@xensource.com> | 2007-03-30 14:13:53 +0100 |
| commit | ea62867372eb87d5cacf9b07e841d8a6caff2635 (patch) | |
| tree | de53846bd949c76bec3e478d2539cb2579e66569 /linux-2.6-xen-sparse | |
| parent | c3df8d6442379601af2542521ee8ae198858a8f2 (diff) | |
| download | xen-ea62867372eb87d5cacf9b07e841d8a6caff2635.tar.gz xen-ea62867372eb87d5cacf9b07e841d8a6caff2635.tar.bz2 xen-ea62867372eb87d5cacf9b07e841d8a6caff2635.zip | |
[LINUX] Make sure to initialiase the xen features bitmap before first use on x86_64.
Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
Diffstat (limited to 'linux-2.6-xen-sparse')
| -rw-r--r-- | linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c | 2 | ||||
| -rw-r--r-- | linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c b/linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c index 356c0717ff..a9dab81cd0 100644 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c @@ -104,6 +104,8 @@ void __init x86_64_start_kernel(char * real_mode_data) char *s; int i; + setup_xen_features(); + xen_start_info = (struct start_info *)real_mode_data; if (!xen_feature(XENFEAT_auto_translated_physmap)) phys_to_machine_mapping = diff --git a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c index 22164fb524..2e6552859e 100644 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c @@ -625,8 +625,6 @@ void __init setup_arch(char **cmdline_p) #endif - setup_xen_features(); - HYPERVISOR_vm_assist(VMASST_CMD_enable, VMASST_TYPE_writable_pagetables); |