diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-12-17 13:09:31 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-12-17 13:09:31 +0100 |
| commit | 2ec077c186a02c0aae8fc213a7b1d4c35f9626ed (patch) | |
| tree | bc78c495a2031a76d6356135dda2020d4e0f77f8 /arch/x86 | |
| parent | 650400b2ccb8542ff4e2677d66ff083d01c7bd6a (diff) | |
| parent | 4f89fa286f6729312e227e7c2d764e8e7b9d340e (diff) | |
| download | op-kernel-dev-2ec077c186a02c0aae8fc213a7b1d4c35f9626ed.zip op-kernel-dev-2ec077c186a02c0aae8fc213a7b1d4c35f9626ed.tar.gz | |
Merge branch 'upstream-acpi-fixes' into WIP.x86/pti.base
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/fixmap.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h index dcd9fb5..b0c505f 100644 --- a/arch/x86/include/asm/fixmap.h +++ b/arch/x86/include/asm/fixmap.h @@ -104,6 +104,12 @@ enum fixed_addresses { FIX_GDT_REMAP_BEGIN, FIX_GDT_REMAP_END = FIX_GDT_REMAP_BEGIN + NR_CPUS - 1, +#ifdef CONFIG_ACPI_APEI_GHES + /* Used for GHES mapping from assorted contexts */ + FIX_APEI_GHES_IRQ, + FIX_APEI_GHES_NMI, +#endif + __end_of_permanent_fixed_addresses, /* |
