diff options
author | Matthew McClintock <msm@freescale.com> | 2012-08-28 00:42:32 -0500 |
---|---|---|
committer | Matthew McClintock <msm@freescale.com> | 2012-08-28 00:42:36 -0500 |
commit | 766c44ad772bced976a1501662acd95e61007ac4 (patch) | |
tree | 3a86e9be50054e143932f4ae27e1b8fddffbccbb | |
parent | 556225e27e08aaa324f6e6975ed450e4fbdb71c1 (diff) | |
download | meta-fsl-ppc-766c44ad772bced976a1501662acd95e61007ac4.tar.gz |
linux-qoriq-sdk.inc: add patch so perf builds
Originally from Khem Raj
Signed-off-by: Matthew McClintock <msm@freescale.com>
-rw-r--r-- | recipes-kernel/linux/0001-compiler.h-Undef-before-redefining-__attribute_const.patch | 28 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-qoriq-sdk.inc | 3 |
2 files changed, 30 insertions, 1 deletions
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 @@ | |||
1 | From 6f92ab6de9d8daeb575949bbbcbc7bcdcebc60af Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem at gmail.com> | ||
3 | Date: Thu, 5 Jan 2012 11:42:35 -0800 | ||
4 | Subject: [PATCH] compiler.h: Undef before redefining __attribute_const__ | ||
5 | |||
6 | This is required to avoid warnings like | ||
7 | util/include/linux/compiler.h:8:0: error: "__attribute_const__" redefined [-Werror] | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem at gmail.com> | ||
10 | --- | ||
11 | tools/perf/util/include/linux/compiler.h | 4 +++- | ||
12 | 1 files changed, 3 insertions(+), 1 deletions(-) | ||
13 | |||
14 | --- a/tools/perf/util/include/linux/compiler.h | ||
15 | +++ b/tools/perf/util/include/linux/compiler.h | ||
16 | @@ -4,9 +4,11 @@ | ||
17 | #ifndef __always_inline | ||
18 | #define __always_inline inline | ||
19 | #endif | ||
20 | +#undef __user | ||
21 | #define __user | ||
22 | +#undef __attribute_const__ | ||
23 | #define __attribute_const__ | ||
24 | - | ||
25 | +#undef __used | ||
26 | #define __used __attribute__((__unused__)) | ||
27 | |||
28 | #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 @@ | |||
1 | LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" | 1 | LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" |
2 | 2 | ||
3 | PV = "3.0.34" | 3 | PV = "3.0.34" |
4 | PR = "r4" | 4 | PR = "r5" |
5 | 5 | ||
6 | SRCREV = "fsl-sdk-v1.2.1" | 6 | SRCREV = "fsl-sdk-v1.2.1" |
7 | SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git \ | 7 | SRC_URI = "git://git.freescale.com/ppc/sdk/linux.git \ |
8 | file://0001-compiler.h-Undef-before-redefining-__attribute_const.patch \ | ||
8 | " | 9 | " |
9 | 10 | ||
10 | KSRC ?= "" | 11 | KSRC ?= "" |