ia64/xen-unstable

changeset 14496:f1833268b28f

LINUX: x86_64: start_pfn should be initialised even when XENFEAT_auto_translated_physmap is set.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
author Ian Campbell <ian.campbell@xensource.com>
date Wed Mar 21 08:51:51 2007 +0000 (2007-03-21)
parents 3fd9b0c71b8c
children c9ac275f8985
files linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c	Tue Mar 20 17:36:18 2007 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c	Wed Mar 21 08:51:51 2007 +0000
     1.3 @@ -105,13 +105,11 @@ void __init x86_64_start_kernel(char * r
     1.4  	int i;
     1.5  
     1.6  	xen_start_info = (struct start_info *)real_mode_data;
     1.7 -	if (!xen_feature(XENFEAT_auto_translated_physmap)) {
     1.8 +	if (!xen_feature(XENFEAT_auto_translated_physmap))
     1.9  		phys_to_machine_mapping =
    1.10  			(unsigned long *)xen_start_info->mfn_list;
    1.11 -		start_pfn = (__pa(xen_start_info->pt_base) >> PAGE_SHIFT) +
    1.12 -			xen_start_info->nr_pt_frames;
    1.13 -	}
    1.14 -
    1.15 +	start_pfn = (__pa(xen_start_info->pt_base) >> PAGE_SHIFT) +
    1.16 +		xen_start_info->nr_pt_frames;
    1.17  
    1.18  	machine_to_phys_mapping = (unsigned long *)MACH2PHYS_VIRT_START;
    1.19  	machine_to_phys_nr_ents = MACH2PHYS_NR_ENTRIES;