diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2016-03-30 15:54:39 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2016-03-30 15:54:52 -0400 |
| commit | b37bd2e19dba85d42d1998b5d71a7519a1bf2808 (patch) | |
| tree | 4673fc15cba98e158b0e7a6ca57625424372b415 | |
| parent | 803c5b964daca775fc5430f37557f60dc36a075f (diff) | |
| download | kernel-b37bd2e19dba85d42d1998b5d71a7519a1bf2808.tar.gz kernel-b37bd2e19dba85d42d1998b5d71a7519a1bf2808.tar.xz kernel-b37bd2e19dba85d42d1998b5d71a7519a1bf2808.zip | |
Fix undefined __always_inline in exported headers (rhbz 1321749)
| -rw-r--r-- | kernel.spec | 4 | ||||
| -rw-r--r-- | uapi-linux-stddef.h-Provide-__always_inline-to-users.patch | 42 |
2 files changed, 46 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec index 1295b9de2..213da785f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -636,6 +636,9 @@ Patch687: mct_u232-sanity-checking-in-probe.patch Patch688: sound-usb-fix-NULL-dereference-in-usb_audio_probe.patch +#rhbz 1321749 +Patch689: uapi-linux-stddef.h-Provide-__always_inline-to-users.patch + # END OF PATCH DEFINITIONS %endif @@ -2162,6 +2165,7 @@ fi # %changelog * Wed Mar 30 2016 Josh Boyer <jwboyer@fedoraproject.org> +- Fix undefined __always_inline in exported headers (rhbz 1321749) - Make sure to install objtool in -devel subpackage if it exists (rhbz 1321628) * Wed Mar 30 2016 Peter Robinson <pbrobinson@fedoraproject.org> diff --git a/uapi-linux-stddef.h-Provide-__always_inline-to-users.patch b/uapi-linux-stddef.h-Provide-__always_inline-to-users.patch new file mode 100644 index 000000000..ba6628efb --- /dev/null +++ b/uapi-linux-stddef.h-Provide-__always_inline-to-users.patch @@ -0,0 +1,42 @@ +From dd39fab52b6b8e86381d0da847a0252384926832 Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko <dvlasenk@redhat.com> +Date: Wed, 30 Mar 2016 00:14:57 +0200 +Subject: [PATCH] uapi/linux/stddef.h: Provide __always_inline to userspace + headers + +Recent change to uapi/linux/swab.h needs this. + +Unfortunately, UAPI headers don't include compiler.h and fixing it there is not enough. + +Tested. Testcase: "make headers_install" and try to compile this: + + #include <linux/swab.h> + void main() {} + +Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com> +CC: Josh Boyer <jwboyer@fedoraproject.org> +CC: Thomas Graf <tgraf@suug.ch> +CC: Peter Zijlstra <peterz@infradead.org> +CC: David Rientjes <rientjes@google.com> +CC: Arnd Bergmann <arnd@arndb.de> +CC: Ingo Molnar <mingo@kernel.org> +CC: Andrew Morton <akpm@linux-foundation.org> +CC: Linus Torvalds <torvalds@linux-foundation.org> +CC: linux-kernel@vger.kernel.org +--- + include/uapi/linux/stddef.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/include/uapi/linux/stddef.h b/include/uapi/linux/stddef.h +index aa9f10428743..621fa8ac4425 100644 +--- a/include/uapi/linux/stddef.h ++++ b/include/uapi/linux/stddef.h +@@ -1 +1,5 @@ + #include <linux/compiler.h> ++ ++#ifndef __always_inline ++#define __always_inline inline ++#endif +-- +2.5.5 + |