diff options
| author | Radim Krčmář | 2018-09-07 18:30:47 +0200 |
|---|---|---|
| committer | Radim Krčmář | 2018-09-07 18:30:47 +0200 |
| commit | ed2ef29100644eabc6099cbf1a3aa9d938555ab8 (patch) | |
| tree | dadd3eb5d77ae2c44adc92869c662292bd652f46 /arch/powerpc | |
| parent | 732b53146ac8f604e45c593efe0579f78205fdcc (diff) | |
| parent | df88f3181f10565c6e3a89eb6f0f9e6afaaf15f1 (diff) | |
Merge tag 'kvm-s390-master-4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux
KVM: s390: Fixes for 4.19
- Fallout from the hugetlbfs support: pfmf interpretion and locking
- VSIE: fix keywrapping for nested guests
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index db0b6eebbfa5..a80669209155 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -177,7 +177,6 @@ config PPC select HAVE_ARCH_KGDB select HAVE_ARCH_MMAP_RND_BITS select HAVE_ARCH_MMAP_RND_COMPAT_BITS if COMPAT - select HAVE_ARCH_PREL32_RELOCATIONS select HAVE_ARCH_SECCOMP_FILTER select HAVE_ARCH_TRACEHOOK select HAVE_CBPF_JIT if !PPC64 |