diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2011-08-22 17:15:34 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2011-08-22 17:15:34 -0400 |
| commit | d20ff5e932dccbeac28c81b9b70a842b8fa60a9f (patch) | |
| tree | c109e761d45fc7a60491001b5293c7e8356ee354 /fix-perf-build.patch | |
| parent | 0b3ccf1fa57692b745503d53b8f7712250ecfb51 (diff) | |
| download | kernel-d20ff5e932dccbeac28c81b9b70a842b8fa60a9f.tar.gz kernel-d20ff5e932dccbeac28c81b9b70a842b8fa60a9f.tar.xz kernel-d20ff5e932dccbeac28c81b9b70a842b8fa60a9f.zip | |
3.1-rc3.
Add patch to fix duplicate backlight registration on i915
Diffstat (limited to 'fix-perf-build.patch')
| -rw-r--r-- | fix-perf-build.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/fix-perf-build.patch b/fix-perf-build.patch deleted file mode 100644 index c4e55ab5..00000000 --- a/fix-perf-build.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 602d6a279939ec30fc7f3ae9d10e3640854f77b2 Mon Sep 17 00:00:00 2001 -From: Josh Boyer <jwboyer@redhat.com> -Date: Thu, 18 Aug 2011 07:24:25 -0400 -Subject: [PATCH] Fix perf build against newer glibc - -Upstream glibc commit 295e904 added a definition for __attribute_const__ to -cdefs.h. This causes the following error when building perf: - -util/include/linux/compiler.h:8:0: error: "__attribute_const__" redefined [-Werror] -/usr/include/sys/cdefs.h:226:0: note: this is the location of the previous definition - -Wrap __attribute_const__ in #ifndef as we do for __always_inline. - -Signed-off-by: Josh Boyer <jwboyer@redhat.com> ---- - tools/perf/util/include/linux/compiler.h | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/tools/perf/util/include/linux/compiler.h b/tools/perf/util/include/linux/compiler.h -index 791f9dd..547628e 100644 ---- a/tools/perf/util/include/linux/compiler.h -+++ b/tools/perf/util/include/linux/compiler.h -@@ -5,7 +5,9 @@ - #define __always_inline inline - #endif - #define __user -+#ifndef __attribute_const__ - #define __attribute_const__ -+#endif - - #define __used __attribute__((__unused__)) - --- -1.7.6 - |