diff options
| author | Linus Torvalds | 2020-10-14 10:34:45 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2020-10-14 10:34:45 -0700 |
| commit | a09b1d78505eb9fe27597a5174c61a7c66253fe8 (patch) | |
| tree | 7392adfff3548378b093fe95f7e3b48fa4e24195 /arch/arm64 | |
| parent | 4907a43da83184d4e88009654c9b31f5e091f709 (diff) | |
| parent | 32118f97f41d26a2447118fa956715cb4bd1bdac (diff) | |
Merge tag 'for-linus-5.10b-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen updates from Juergen Gross:
- two small cleanup patches
- avoid error messages when initializing MCA banks in a Xen dom0
- a small series for converting the Xen gntdev driver to use
pin_user_pages*() instead of get_user_pages*()
- intermediate fix for running as a Xen guest on Arm with KPTI enabled
(the final solution will need new Xen functionality)
* tag 'for-linus-5.10b-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
x86/xen: Fix typo in xen_pagetable_p2m_free()
x86/xen: disable Firmware First mode for correctable memory errors
xen/arm: do not setup the runstate info page if kpti is enabled
xen: remove redundant initialization of variable ret
xen/gntdev.c: Convert get_user_pages*() to pin_user_pages*()
xen/gntdev.c: Mark pages as dirty
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/include/asm/xen/page.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/xen/page.h b/arch/arm64/include/asm/xen/page.h index 31bbc803cecb..dffdc773221b 100644 --- a/arch/arm64/include/asm/xen/page.h +++ b/arch/arm64/include/asm/xen/page.h @@ -1 +1,7 @@ #include <xen/arm/page.h> +#include <asm/mmu.h> + +static inline bool xen_kernel_unmapped_at_usr(void) +{ + return arm64_kernel_unmapped_at_el0(); +} |