diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-08-26 11:49:51 +0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-26 11:49:51 +0400 |
commit | 2d0b579a9831c927bcebf5f61055e7462f0af2dc (patch) | |
tree | 3181c183b463e745601b1f4efda0f8fff3f1c08b /arch/x86/xen/enlighten.c | |
parent | e80ca144ea902efa7aed446780fd9fad421fd8d3 (diff) | |
parent | 671ee7f0ce62e4b991b47fcf1c161c3f710dabbc (diff) | |
download | linux-2d0b579a9831c927bcebf5f61055e7462f0af2dc.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-fixes-for-linus
Diffstat (limited to 'arch/x86/xen/enlighten.c')
-rw-r--r-- | arch/x86/xen/enlighten.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 974a528458a0..2d69617950f7 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -77,8 +77,8 @@ EXPORT_SYMBOL_GPL(xen_domain_type); unsigned long *machine_to_phys_mapping = (void *)MACH2PHYS_VIRT_START; EXPORT_SYMBOL(machine_to_phys_mapping); -unsigned int machine_to_phys_order; -EXPORT_SYMBOL(machine_to_phys_order); +unsigned long machine_to_phys_nr; +EXPORT_SYMBOL(machine_to_phys_nr); struct start_info *xen_start_info; EXPORT_SYMBOL_GPL(xen_start_info); @@ -951,6 +951,10 @@ static const struct pv_info xen_info __initconst = { .paravirt_enabled = 1, .shared_kernel_pmd = 0, +#ifdef CONFIG_X86_64 + .extra_user_64bit_cs = FLAT_USER_CS64, +#endif + .name = "Xen", }; |