From 766c44ad772bced976a1501662acd95e61007ac4 Mon Sep 17 00:00:00 2001 From: Matthew McClintock Date: Tue, 28 Aug 2012 00:42:32 -0500 Subject: linux-qoriq-sdk.inc: add patch so perf builds Originally from Khem Raj Signed-off-by: Matthew McClintock --- ...Undef-before-redefining-__attribute_const.patch | 28 ++++++++++++++++++++++ recipes-kernel/linux/linux-qoriq-sdk.inc | 3 ++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 recipes-kernel/linux/0001-compiler.h-Undef-before-redefining-__attribute_const.patch diff --git a/recipes-kernel/linux/0001-compiler.h-Undef-before-redefining-__attribute_const.patch b/recipes-kernel/linux/0001-compiler.h-Undef-before-redefining-__attribute_const.patch new file mode 100644 index 0000000..597fd3b --- /dev/null +++ b/recipes-kernel/linux/0001-compiler.h-Undef-before-redefining-__attribute_const.patch @@ -0,0 +1,28 @@ +From 6f92ab6de9d8daeb575949bbbcbc7bcdcebc60af Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 5 Jan 2012 11:42:35 -0800 +Subject: [PATCH] compiler.h: Undef before redefining __attribute_const__ + +This is required to avoid warnings like +util/include/linux/compiler.h:8:0: error: "__attribute_const__" redefined [-Werror] + +Signed-off-by: Khem Raj +--- + tools/perf/util/include/linux/compiler.h | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +--- a/tools/perf/util/include/linux/compiler.h ++++ b/tools/perf/util/include/linux/compiler.h +@@ -4,9 +4,11 @@ + #ifndef __always_inline + #define __always_inline inline + #endif ++#undef __user + #define __user ++#undef __attribute_const__ + #define __attribute_const__ +- ++#undef __used + #define __used __attribute__((__unused__)) + + #endif diff --git a/recipes-kernel/linux/linux-qoriq-sdk.inc b/recipes-kernel/linux/linux-qoriq-sdk.inc index 788eeb7..708ae57 100644 --- a/recipes-kernel/linux/linux-qoriq-sdk.inc +++ b/recipes-kernel/linux/linux-qoriq-sdk.inc @@ -1,10 +1,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" PV = "3.0.34" -PR = "r4" +PR = "r5" SRCREV = "fsl-sdk-v1.2.1" SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git \ + file://0001-compiler.h-Undef-before-redefining-__attribute_const.patch \ " KSRC ?= "" -- cgit v1.2.3-54-g00ecf