ia64/xen-unstable
changeset 14671:4a873ab4e261
[LINUX] Make sure to initialiase the xen features bitmap before first use on x86_64.
Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
author | Ian Campbell <ian.campbell@xensource.com> |
---|---|
date | Fri Mar 30 14:13:53 2007 +0100 (2007-03-30) |
parents | 7ea36c7d6521 |
children | 3c0d15279dc7 |
files | linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c |
line diff
1.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c Fri Mar 30 11:55:34 2007 +0100 1.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c Fri Mar 30 14:13:53 2007 +0100 1.3 @@ -104,6 +104,8 @@ void __init x86_64_start_kernel(char * r 1.4 char *s; 1.5 int i; 1.6 1.7 + setup_xen_features(); 1.8 + 1.9 xen_start_info = (struct start_info *)real_mode_data; 1.10 if (!xen_feature(XENFEAT_auto_translated_physmap)) 1.11 phys_to_machine_mapping =
2.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c Fri Mar 30 11:55:34 2007 +0100 2.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c Fri Mar 30 14:13:53 2007 +0100 2.3 @@ -625,8 +625,6 @@ void __init setup_arch(char **cmdline_p) 2.4 2.5 #endif 2.6 2.7 - setup_xen_features(); 2.8 - 2.9 HYPERVISOR_vm_assist(VMASST_CMD_enable, 2.10 VMASST_TYPE_writable_pagetables); 2.11