summaryrefslogtreecommitdiffstats
path: root/s390-appldata-add-slab.h-for-kzalloc-kfree.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-06-10 08:31:19 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-06-10 08:31:19 -0400
commit9b82ecdfb861cd3daf9d01b050c4937391aec003 (patch)
tree04c35507c2c3b5cabd7ba2fcb217af3e8285c129 /s390-appldata-add-slab.h-for-kzalloc-kfree.patch
parent38d8cd2ec1088b1ea6afe3520826405f20e9adcb (diff)
downloadkernel-9b82ecdfb861cd3daf9d01b050c4937391aec003.tar.gz
kernel-9b82ecdfb861cd3daf9d01b050c4937391aec003.tar.xz
kernel-9b82ecdfb861cd3daf9d01b050c4937391aec003.zip
Update to Linux v3.15
Diffstat (limited to 's390-appldata-add-slab.h-for-kzalloc-kfree.patch')
-rw-r--r--s390-appldata-add-slab.h-for-kzalloc-kfree.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/s390-appldata-add-slab.h-for-kzalloc-kfree.patch b/s390-appldata-add-slab.h-for-kzalloc-kfree.patch
new file mode 100644
index 000000000..3716ce8b1
--- /dev/null
+++ b/s390-appldata-add-slab.h-for-kzalloc-kfree.patch
@@ -0,0 +1,28 @@
+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
+