diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-05-15 11:24:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-05-15 11:24:51 -0700 |
| commit | 4844e7c4c2697afe63f2b925e2384e0c724cb2be (patch) | |
| tree | f4e79ccbe0d67371408955da746f8464e6ff8555 /include | |
| parent | 4c2cd91bff6371b58e672e8791c3bfa70c1b821f (diff) | |
| parent | 4594437880ce347ac8438758fd91543f70da1aa9 (diff) | |
Merge tag 'for-linus-7.1b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross:
- one simple cleanup
- a fix for a corner case when running as Xen PV dom0
- a fix of a regression for Xen PV guests, introduced in 7.0
* tag 'for-linus-7.1b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
x86/xen: Tolerate nested XEN_LAZY_MMU entering/leaving
x86/xen: Fix xen_e820_swap_entry_with_ram()
xen/arm: Replace __ASSEMBLY__ with __ASSEMBLER__ in interface.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/xen/arm/interface.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/xen/arm/interface.h b/include/xen/arm/interface.h index c3eada2642aa..61360b89da40 100644 --- a/include/xen/arm/interface.h +++ b/include/xen/arm/interface.h @@ -30,7 +30,7 @@ #define __HYPERVISOR_platform_op_raw __HYPERVISOR_platform_op -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /* Explicitly size integers that represent pfns in the interface with * Xen so that we can have one ABI that works for 32 and 64 bit guests. * Note that this means that the xen_pfn_t type may be capable of |