diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-11 02:20:06 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-11 02:20:06 +0200 |
| commit | e6383b185a998861cadb2f95d97cfe29945b9c32 (patch) | |
| tree | e842e6bd10e8ad31fbedfc1bdda27b4c3d8c3287 /arch/x86/xen | |
| parent | printk: queue wake_up_klogd irq_work only if per-CPU areas are ready (diff) | |
| parent | x86/xen: fix booting 32-bit pv guest (diff) | |
| download | linux-e6383b185a998861cadb2f95d97cfe29945b9c32.tar.xz linux-e6383b185a998861cadb2f95d97cfe29945b9c32.zip | |
Merge tag 'for-linus-5.7-rc1b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull more xen updates from Juergen Gross:
- two cleanups
- fix a boot regression introduced in this merge window
- fix wrong use of memory allocation flags
* tag 'for-linus-5.7-rc1b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
x86/xen: fix booting 32-bit pv guest
x86/xen: make xen_pvmmu_arch_setup() static
xen/blkfront: fix memory allocation flags in blkfront_setup_indirect()
xen: Use evtchn_type_t as a type for event channels
Diffstat (limited to 'arch/x86/xen')
| -rw-r--r-- | arch/x86/xen/setup.c | 2 | ||||
| -rw-r--r-- | arch/x86/xen/xen-head.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index 33b0e20df7fc..1a2d8a50dac4 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -985,7 +985,7 @@ void xen_enable_syscall(void) #endif /* CONFIG_X86_64 */ } -void __init xen_pvmmu_arch_setup(void) +static void __init xen_pvmmu_arch_setup(void) { HYPERVISOR_vm_assist(VMASST_CMD_enable, VMASST_TYPE_4gb_segments); HYPERVISOR_vm_assist(VMASST_CMD_enable, VMASST_TYPE_writable_pagetables); diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S index 7d1c4fcbe8f7..1ba601df3a37 100644 --- a/arch/x86/xen/xen-head.S +++ b/arch/x86/xen/xen-head.S @@ -38,7 +38,7 @@ SYM_CODE_START(startup_xen) #ifdef CONFIG_X86_64 mov initial_stack(%rip), %rsp #else - mov pa(initial_stack), %esp + mov initial_stack, %esp #endif #ifdef CONFIG_X86_64 |