diff options
| author | Justin M. Forbes <jforbes@redhat.com> | 2012-10-12 11:06:32 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@redhat.com> | 2012-10-12 11:06:32 -0500 |
| commit | ad58b20867e277aaf7ae7c5b4472a8cabe96f225 (patch) | |
| tree | df8a0005104c31f5b831ed29c6e2740bc244a29b | |
| parent | 5b5cc3df8e5f83cac698a0961d09b2c02cedebcf (diff) | |
| download | kernel-ad58b20867e277aaf7ae7c5b4472a8cabe96f225.tar.gz kernel-ad58b20867e277aaf7ae7c5b4472a8cabe96f225.tar.xz kernel-ad58b20867e277aaf7ae7c5b4472a8cabe96f225.zip | |
v3.6-10630-gccff9b1
| -rw-r--r-- | kernel.spec | 11 | ||||
| -rw-r--r-- | perf-build-fix.patch | 68 | ||||
| -rw-r--r-- | sources | 2 |
3 files changed, 5 insertions, 76 deletions
diff --git a/kernel.spec b/kernel.spec index c6367e5b8..4b9233ca1 100644 --- a/kernel.spec +++ b/kernel.spec @@ -95,7 +95,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 5 +%define gitrev 6 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -753,9 +753,6 @@ Patch22066: virtio-scsi-Initialize-scatterlist-structure.patch #rhbz 846037 Patch22067: selinux-Fix-sel_netnode_insert-suspicious-rcu-dereference.patch -#Perf build fix, should go away soon -Patch22070: perf-build-fix.patch - # END OF PATCH DEFINITIONS %endif @@ -1457,9 +1454,6 @@ ApplyPatch virtio-scsi-Initialize-scatterlist-structure.patch #rhbz 846037 ApplyPatch selinux-Fix-sel_netnode_insert-suspicious-rcu-dereference.patch -#Perf build fix, should go away soon -ApplyPatch perf-build-fix.patch - # END OF PATCH APPLICATIONS %endif @@ -2313,6 +2307,9 @@ fi # ||----w | # || || %changelog +* Fri Oct 12 2012 Justin M. Forbes <jforbes@redhat.com> +- v3.6-10630-gccff9b1 + * Wed Oct 10 2012 Justin M. Forbes <jforbes@redhat.com> - v3.6-9849-g2474542 diff --git a/perf-build-fix.patch b/perf-build-fix.patch deleted file mode 100644 index 341620c0d..000000000 --- a/perf-build-fix.patch +++ /dev/null @@ -1,68 +0,0 @@ -Perf build fails with the new rbtree implementation: - -../../lib/rbtree.c:24:36: fatal error: linux/rbtree_augmented.h: No such -file or -directory -compilation terminated. -make[2]: *** [util/rbtree.o] Error 1 -make[1]: *** [perf_install] Error 2 -make: *** [tools/perf_install] Error 2 - -Fix by updating the Makefile and adding a btree_augmented.h wrapper. - -Reported-by: Borislav Petkov <borislav.petkov@amd.com> -Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de> ---- - tools/perf/Makefile | 3 ++- - tools/perf/util/include/linux/rbtree.h | 1 - - tools/perf/util/include/linux/rbtree_augmented.h | 2 ++ - tools/perf/util/scripting-engines/trace-event-perl.c | 2 +- - 4 files changed, 5 insertions(+), 3 deletions(-) - create mode 100644 tools/perf/util/include/linux/rbtree_augmented.h - -diff --git a/tools/perf/Makefile b/tools/perf/Makefile -index 86258c2..9546ff5 100644 ---- a/tools/perf/Makefile -+++ b/tools/perf/Makefile -@@ -268,6 +268,7 @@ LIB_H += util/include/linux/magic.h - LIB_H += util/include/linux/poison.h - LIB_H += util/include/linux/prefetch.h - LIB_H += util/include/linux/rbtree.h -+LIB_H += util/include/linux/rbtree_augmented.h - LIB_H += util/include/linux/string.h - LIB_H += util/include/linux/types.h - LIB_H += util/include/linux/linkage.h -@@ -906,7 +907,7 @@ $(OUTPUT)ui/browsers/map.o: ui/browsers/map.c $(OUTPUT)PERF-CFLAGS - $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DENABLE_SLFUTURE_CONST $< - - $(OUTPUT)util/rbtree.o: ../../lib/rbtree.c $(OUTPUT)PERF-CFLAGS -- $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $< -+ $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -Wno-unused-parameter -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $< - - $(OUTPUT)util/parse-events.o: util/parse-events.c $(OUTPUT)PERF-CFLAGS - $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -Wno-redundant-decls $< -diff --git a/tools/perf/util/include/linux/rbtree.h b/tools/perf/util/include/linux/rbtree.h -index 9bcdc84..2a030c5 100644 ---- a/tools/perf/util/include/linux/rbtree.h -+++ b/tools/perf/util/include/linux/rbtree.h -@@ -1,3 +1,2 @@ - #include <stdbool.h> --#include <stdbool.h> - #include "../../../../include/linux/rbtree.h" -diff --git a/tools/perf/util/include/linux/rbtree_augmented.h b/tools/perf/util/include/linux/rbtree_augmented.h -new file mode 100644 -index 0000000..9d6fcdf ---- /dev/null -+++ b/tools/perf/util/include/linux/rbtree_augmented.h -@@ -0,0 +1,2 @@ -+#include <stdbool.h> -+#include "../../../../include/linux/rbtree_augmented.h" -diff --git a/tools/perf/util/scripting-engines/trace-event-perl.c b/tools/perf/util/scripting-engines/trace-event-perl.c -index f80605e..f53889d 100644 --- -Markus --- -To unsubscribe from this list: send the line "unsubscribe linux-kernel" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html -Please read the FAQ at http://www.tux.org/lkml/ @@ -1,2 +1,2 @@ 1a1760420eac802c541a20ab51a093d1 linux-3.6.tar.xz -c2349c9ef9c4b5e60e012fc53b75ad79 patch-3.6-git5.xz +62b55d8b93a0ba97ce90fc6fa87f26a7 patch-3.6-git6.xz |