diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-24 11:12:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-24 11:12:27 -0700 |
| commit | 19caf581ba441659f1a71e9a5baed032fdcfceef (patch) | |
| tree | 5937b0280fa6c5fb9eb67bdf6a0cf1aef364d683 /arch/x86/mm/pti.c | |
| parent | a75eda7bce5e8ffdebe6ddfe513b31e5ec3527d2 (diff) | |
| parent | ffc8599aa9763f39f6736a79da4d1575e7006f9a (diff) | |
| download | kernel_replicant_linux-19caf581ba441659f1a71e9a5baed032fdcfceef.tar.gz kernel_replicant_linux-19caf581ba441659f1a71e9a5baed032fdcfceef.tar.bz2 kernel_replicant_linux-19caf581ba441659f1a71e9a5baed032fdcfceef.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Thomas Gleixner:
"A set of x86 fixes:
- Prevent potential NULL pointer dereferences in the HPET and HyperV
code
- Exclude the GART aperture from /proc/kcore to prevent kernel
crashes on access
- Use the correct macros for Cyrix I/O on Geode processors
- Remove yet another kernel address printk leak
- Announce microcode reload completion as requested by quite some
people. Microcode loading has become popular recently.
- Some 'Make Clang' happy fixlets
- A few cleanups for recently added code"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/gart: Exclude GART aperture from kcore
x86/hw_breakpoints: Make default case in hw_breakpoint_arch_parse() return an error
x86/mm/pti: Make local symbols static
x86/cpu/cyrix: Remove {get,set}Cx86_old macros used for Cyrix processors
x86/cpu/cyrix: Use correct macros for Cyrix calls on Geode processors
x86/microcode: Announce reload operation's completion
x86/hyperv: Prevent potential NULL pointer dereference
x86/hpet: Prevent potential NULL pointer dereference
x86/lib: Fix indentation issue, remove extra tab
x86/boot: Restrict header scope to make Clang happy
x86/mm: Don't leak kernel addresses
x86/cpufeature: Fix various quality problems in the <asm/cpu_device_hd.h> header
Diffstat (limited to 'arch/x86/mm/pti.c')
| -rw-r--r-- | arch/x86/mm/pti.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/mm/pti.c b/arch/x86/mm/pti.c index 4fee5c3003ed..139b28a01ce4 100644 --- a/arch/x86/mm/pti.c +++ b/arch/x86/mm/pti.c @@ -77,7 +77,7 @@ static void __init pti_print_if_secure(const char *reason) pr_info("%s\n", reason); } -enum pti_mode { +static enum pti_mode { PTI_AUTO = 0, PTI_FORCE_OFF, PTI_FORCE_ON @@ -602,7 +602,7 @@ static void pti_clone_kernel_text(void) set_memory_global(start, (end_global - start) >> PAGE_SHIFT); } -void pti_set_kernel_image_nonglobal(void) +static void pti_set_kernel_image_nonglobal(void) { /* * The identity map is created with PMDs, regardless of the |