diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-05-15 14:16:36 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-05-15 14:16:36 -0400 |
| commit | f055781cf89f073e979c9198af6672ec12314972 (patch) | |
| tree | 8e45cadf71a54b86a79e4289115ad6f9b063e69c | |
| parent | f19b8f46b47bfe39e97004c5592930b8ac810a3b (diff) | |
| download | kernel-f055781cf89f073e979c9198af6672ec12314972.tar.gz kernel-f055781cf89f073e979c9198af6672ec12314972.tar.xz kernel-f055781cf89f073e979c9198af6672ec12314972.zip | |
Fix build fail on s390x
| -rw-r--r-- | kernel.spec | 10 | ||||
| -rw-r--r-- | s390-appldata-add-slab.h-for-kzalloc-kfree.patch | 28 |
2 files changed, 37 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec index 2b0de2858..11352bc59 100644 --- a/kernel.spec +++ b/kernel.spec @@ -40,7 +40,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 8 +%global baserelease 9 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -641,6 +641,9 @@ Patch25069: 0001-acpi-video-Add-4-new-models-to-the-use_native_backli.patch #rhbz 1089545 Patch25070: 0001-acpi-video-Add-use_native_backlight-quirks-for-Think.patch +Patch25071: s390-appldata-add-slab.h-for-kzalloc-kfree.patch + + # END OF PATCH DEFINITIONS %endif @@ -1361,6 +1364,8 @@ ApplyPatch 0001-acpi-video-Add-4-new-models-to-the-use_native_backli.patch #rhbz 1089545 ApplyPatch 0001-acpi-video-Add-use_native_backlight-quirks-for-Think.patch +ApplyPatch s390-appldata-add-slab.h-for-kzalloc-kfree.patch + # END OF PATCH APPLICATIONS %endif @@ -2231,6 +2236,9 @@ fi # ||----w | # || || %changelog +* Thu May 15 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc5.git2.9 +- Fix build fail on s390x + * Wed May 14 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc5.git2.8 - Enable autoprov for kernel module Provides (rhbz 1058331) - Enable xz compressed modules (from Kyle McMartin) 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 + |