mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-05-07 03:49:20 +00:00
linux-3.0: Fix perf compile failure with eglibc 2.15
There is a conflict with eglibc headers since new headers added the defines that compiler.h was redefining without undefining them Signed-off-by: Khem Raj <raj.khem@gmail.com> Acked-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
+31
@@ -0,0 +1,31 @@
|
|||||||
|
From 6f92ab6de9d8daeb575949bbbcbc7bcdcebc60af Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
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 <raj.khem@gmail.com>
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
---
|
||||||
|
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
|
||||||
@@ -13,7 +13,7 @@ git reset --hard ${TAG}
|
|||||||
rm export -rf
|
rm export -rf
|
||||||
|
|
||||||
previous=${TAG}
|
previous=${TAG}
|
||||||
PATCHSET="pm-wip/voltdm pm-wip/cpufreq beagle madc sakoman sgx ulcd omap4"
|
PATCHSET="pm-wip/voltdm pm-wip/cpufreq beagle madc sakoman sgx ulcd omap4 misc"
|
||||||
|
|
||||||
# apply patches
|
# apply patches
|
||||||
for patchset in ${PATCHSET} ; do
|
for patchset in ${PATCHSET} ; do
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ PV = "3.0.17"
|
|||||||
SRCREV_pn-${PN} = "e9d23be2708477feeaec78e707c80441520c1ef6"
|
SRCREV_pn-${PN} = "e9d23be2708477feeaec78e707c80441520c1ef6"
|
||||||
|
|
||||||
# The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc
|
# The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc
|
||||||
MACHINE_KERNEL_PR_append = "a"
|
MACHINE_KERNEL_PR_append = "b"
|
||||||
|
|
||||||
FILESPATH =. "${FILE_DIRNAME}/linux-3.0:${FILE_DIRNAME}/linux-3.0/${MACHINE}:"
|
FILESPATH =. "${FILE_DIRNAME}/linux-3.0:${FILE_DIRNAME}/linux-3.0/${MACHINE}:"
|
||||||
|
|
||||||
@@ -221,6 +221,8 @@ SRC_URI += "git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.gi
|
|||||||
\
|
\
|
||||||
file://omap4/0001-OMAP-Fix-linking-error-in-twl-common.c-for-OMAP2-3-4.patch \
|
file://omap4/0001-OMAP-Fix-linking-error-in-twl-common.c-for-OMAP2-3-4.patch \
|
||||||
\
|
\
|
||||||
|
file://misc/0001-compiler.h-Undef-before-redefining-__attribute_const.patch \
|
||||||
|
\
|
||||||
file://defconfig"
|
file://defconfig"
|
||||||
|
|
||||||
SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \
|
SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \
|
||||||
|
|||||||
Reference in New Issue
Block a user