diff options
| author | Laura Abbott <labbott@fedoraproject.org> | 2015-09-01 15:03:08 -0700 |
|---|---|---|
| committer | Laura Abbott <labbott@fedoraproject.org> | 2015-09-01 15:59:56 -0700 |
| commit | d07b889185195409a6090ed3e12fff475b4258f4 (patch) | |
| tree | c2b98784a9c45c2ba5420c4a256c03d1c1c2e125 /s390-appldata-add-slab.h-for-kzalloc-kfree.patch | |
| parent | 07775e21b6d0c7b9c2251deb8cb5ef3052a38c6e (diff) | |
| download | kernel-d07b889185195409a6090ed3e12fff475b4258f4.tar.gz kernel-d07b889185195409a6090ed3e12fff475b4258f4.tar.xz kernel-d07b889185195409a6090ed3e12fff475b4258f4.zip | |
Linux v4.2
This is a squashed patch of the history from F22 + the 4.2 rebase
Diffstat (limited to 's390-appldata-add-slab.h-for-kzalloc-kfree.patch')
| -rw-r--r-- | s390-appldata-add-slab.h-for-kzalloc-kfree.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/s390-appldata-add-slab.h-for-kzalloc-kfree.patch b/s390-appldata-add-slab.h-for-kzalloc-kfree.patch deleted file mode 100644 index 3716ce8b1..000000000 --- a/s390-appldata-add-slab.h-for-kzalloc-kfree.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 1eb5e8b7449ff017c2f358d97bd2fcd4eb87cc53 Mon Sep 17 00:00:00 2001 -From: Jeff Mahoney <jeffm@suse.com> -Date: Sun, 27 Apr 2014 17:35:43 -0400 -Subject: s390/appldata: add slab.h for kzalloc/kfree - -This fixes: -arch/s390/appldata/appldata_mem.c:135:2: error: implicit declaration of function 'kzalloc' [-Werror=implicit-function-declaration] -arch/s390/appldata/appldata_mem.c:141:3: error: implicit declaration of function 'kfree' [-Werror=implicit-function-declaration] - -Signed-off-by: Jeff Mahoney <jeffm@suse.com> -Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> -Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> - -diff --git a/arch/s390/appldata/appldata_mem.c b/arch/s390/appldata/appldata_mem.c -index 42be537..edcf2a7 100644 ---- a/arch/s390/appldata/appldata_mem.c -+++ b/arch/s390/appldata/appldata_mem.c -@@ -13,6 +13,7 @@ - #include <linux/kernel_stat.h> - #include <linux/pagemap.h> - #include <linux/swap.h> -+#include <linux/slab.h> - #include <asm/io.h> - - #include "appldata.h" --- -cgit v0.10.1 - |