diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2020-07-10 11:45:22 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-07-10 11:45:22 +0200 |
| commit | bc916e67c0eeb734fa877e63128db3d2352508f4 (patch) | |
| tree | 530a19cda8cc36f7662d1ed417abd32d1e75cbfd /arch/x86/include/asm/idtentry.h | |
| parent | x86/entry: Rename idtentry_enter/exit_cond_rcu() to idtentry_enter/exit() (diff) | |
| parent | x86/entry/common: Make prepare_exit_to_usermode() static (diff) | |
| download | linux-bc916e67c0eeb734fa877e63128db3d2352508f4.tar.xz linux-bc916e67c0eeb734fa877e63128db3d2352508f4.zip | |
Merge branch 'x86/urgent' into x86/entry to pick up upstream fixes.
Diffstat (limited to 'arch/x86/include/asm/idtentry.h')
| -rw-r--r-- | arch/x86/include/asm/idtentry.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/idtentry.h b/arch/x86/include/asm/idtentry.h index 7227225cf45d..2293b443b193 100644 --- a/arch/x86/include/asm/idtentry.h +++ b/arch/x86/include/asm/idtentry.h @@ -557,7 +557,7 @@ DECLARE_IDTENTRY_RAW(X86_TRAP_MC, exc_machine_check); /* NMI */ DECLARE_IDTENTRY_NMI(X86_TRAP_NMI, exc_nmi); -#ifdef CONFIG_XEN_PV +#if defined(CONFIG_XEN_PV) && defined(CONFIG_X86_64) DECLARE_IDTENTRY_RAW(X86_TRAP_NMI, xenpv_exc_nmi); #endif @@ -567,7 +567,7 @@ DECLARE_IDTENTRY_DEBUG(X86_TRAP_DB, exc_debug); #else DECLARE_IDTENTRY_RAW(X86_TRAP_DB, exc_debug); #endif -#ifdef CONFIG_XEN_PV +#if defined(CONFIG_XEN_PV) && defined(CONFIG_X86_64) DECLARE_IDTENTRY_RAW(X86_TRAP_DB, xenpv_exc_debug); #endif |