diff options
author | 2018-09-07 18:30:47 +0200 | |
---|---|---|
committer | 2018-09-07 18:30:47 +0200 | |
commit | ed2ef29100644eabc6099cbf1a3aa9d938555ab8 (patch) | |
tree | dadd3eb5d77ae2c44adc92869c662292bd652f46 /lib | |
parent | Merge tag 'kvm-ppc-fixes-4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc (diff) | |
parent | KVM: s390: Properly lock mm context allow_gmap_hpage_1m setting (diff) | |
download | wireguard-linux-ed2ef29100644eabc6099cbf1a3aa9d938555ab8.tar.xz wireguard-linux-ed2ef29100644eabc6099cbf1a3aa9d938555ab8.zip |
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 'lib')
-rw-r--r-- | lib/percpu_counter.c | 1 | ||||
-rw-r--r-- | lib/rhashtable.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c index c72577e472f2..a66595ba5543 100644 --- a/lib/percpu_counter.c +++ b/lib/percpu_counter.c @@ -4,7 +4,6 @@ */ #include <linux/percpu_counter.h> -#include <linux/notifier.h> #include <linux/mutex.h> #include <linux/init.h> #include <linux/cpu.h> diff --git a/lib/rhashtable.c b/lib/rhashtable.c index 310e29b51507..30526afa8343 100644 --- a/lib/rhashtable.c +++ b/lib/rhashtable.c @@ -28,7 +28,6 @@ #include <linux/rhashtable.h> #include <linux/err.h> #include <linux/export.h> -#include <linux/rhashtable.h> #define HASH_DEFAULT_SIZE 64UL #define HASH_MIN_SIZE 4U |