[Xen-changelog] [xen-unstable] LINUX: x86_64: start_pfn should be initialised even when XENFEAT_auto_translated_physmap is set.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
# Date 1174467111 0
# Node ID f1833268b28fa1d8b6f81c634aeb19143d1cff1e
# Parent  3fd9b0c71b8c687b108a8bf671c9c4fc47046a0a
LINUX: x86_64: start_pfn should be initialised even when 
XENFEAT_auto_translated_physmap is set.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
---
 linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff -r 3fd9b0c71b8c -r f1833268b28f 
linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c      Tue Mar 20 
17:36:18 2007 +0000
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c      Wed Mar 21 
08:51:51 2007 +0000
@@ -105,13 +105,11 @@ void __init x86_64_start_kernel(char * r
        int i;
 
        xen_start_info = (struct start_info *)real_mode_data;
-       if (!xen_feature(XENFEAT_auto_translated_physmap)) {
+       if (!xen_feature(XENFEAT_auto_translated_physmap))
                phys_to_machine_mapping =
                        (unsigned long *)xen_start_info->mfn_list;
-               start_pfn = (__pa(xen_start_info->pt_base) >> PAGE_SHIFT) +
-                       xen_start_info->nr_pt_frames;
-       }
-
+       start_pfn = (__pa(xen_start_info->pt_base) >> PAGE_SHIFT) +
+               xen_start_info->nr_pt_frames;
 
        machine_to_phys_mapping = (unsigned long *)MACH2PHYS_VIRT_START;
        machine_to_phys_nr_ents = MACH2PHYS_NR_ENTRIES;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog