OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'stable/for-linus-3.16-rc1-tag' of git://git.kernel.org/pub/scm/linux/kerne...
[uclinux-h8/linux.git]
/
arch
/
x86
/
xen
/
enlighten.c
diff --git
a/arch/x86/xen/enlighten.c
b/arch/x86/xen/enlighten.c
index
f17b292
..
ffb101e
100644
(file)
--- a/
arch/x86/xen/enlighten.c
+++ b/
arch/x86/xen/enlighten.c
@@
-1537,7
+1537,10
@@
asmlinkage __visible void __init xen_start_kernel(void)
if (!xen_pvh_domain())
pv_cpu_ops = xen_cpu_ops;
if (!xen_pvh_domain())
pv_cpu_ops = xen_cpu_ops;
- x86_init.resources.memory_setup = xen_memory_setup;
+ if (xen_feature(XENFEAT_auto_translated_physmap))
+ x86_init.resources.memory_setup = xen_auto_xlated_memory_setup;
+ else
+ x86_init.resources.memory_setup = xen_memory_setup;
x86_init.oem.arch_setup = xen_arch_setup;
x86_init.oem.banner = xen_banner;
x86_init.oem.arch_setup = xen_arch_setup;
x86_init.oem.banner = xen_banner;