rpms/kernel/devel revert-ftrace-powerpc-snafu.patch, NONE, 1.1 kernel.spec, 1.1694, 1.1695
Dave Airlie
airlied at fedoraproject.org
Wed Aug 5 07:14:50 UTC 2009
- Previous message: rpms/gflags/devel .cvsignore, 1.3, 1.4 gflags.spec, 1.6, 1.7 import.log, 1.2, 1.3 sources, 1.3, 1.4 gflags-1.0-gcc44.patch, 1.1, NONE
- Next message: rpms/svgalib/devel import.log, NONE, 1.1 svgalib-1.9.25-round_gtf_gtfcalc_c.patch, NONE, 1.1 svgalib.spec, 1.14, 1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: airlied
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21393
Modified Files:
kernel.spec
Added Files:
revert-ftrace-powerpc-snafu.patch
Log Message:
* Wed Aug 05 2009 Dave Airlie <airlied at redhat.com> 2.6.31.0.129.rc5.git3
- revert-ftrace-powerpc-snafu.patch - fix ppc build
revert-ftrace-powerpc-snafu.patch:
recordmcount.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE revert-ftrace-powerpc-snafu.patch ---
commit 4e7fea66de82caf76bf11213150b629562cca74b
Author: Dave Airlie <airlied at ppcg5.localdomain>
Date: Wed Aug 5 17:07:10 2009 +1000
Revert "ftrace: Fix the conditional that updates $ref_func"
This reverts commit fc4c73554c9d93b3e495f2f7acae1323b0d5db84.
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index d29baa2..d99b343 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -414,7 +414,7 @@ while (<IN>) {
$offset = hex $1;
} else {
# if we already have a function, and this is weak, skip it
- if (!defined($ref_func) && !defined($weak{$text})) {
+ if (!defined($ref_func) || !defined($weak{$text})) {
$ref_func = $text;
$offset = hex $1;
}
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1694
retrieving revision 1.1695
diff -u -p -r1.1694 -r1.1695
--- kernel.spec 5 Aug 2009 05:54:37 -0000 1.1694
+++ kernel.spec 5 Aug 2009 07:14:49 -0000 1.1695
@@ -588,6 +588,8 @@ Patch05: linux-2.6-makefile-after_link.p
%if !%{nopatches}
+# revert powerpc breakage
+Patch08: revert-ftrace-powerpc-snafu.patch
# revert upstream patches we get via other methods
Patch09: linux-2.6-upstream-reverts.patch
# Git trees.
@@ -1109,6 +1111,7 @@ ApplyOptionalPatch linux-2.6-compile-fix
# revert patches from upstream that conflict or that we get via other means
ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R
+ApplyPatch revert-ftrace-powerpc-snafu.patch
#ApplyPatch git-cpufreq.patch
#ApplyPatch git-bluetooth.patch
@@ -1943,6 +1946,9 @@ fi
# and build.
%changelog
+* Wed Aug 05 2009 Dave Airlie <airlied at redhat.com> 2.6.31.0.132.rc5.git3
+- revert-ftrace-powerpc-snafu.patch - fix ppc build
+
* Wed Aug 05 2009 Ben Skeggs <bskeggs at redhat.com>
- nouveau: respect nomodeset
- Previous message: rpms/gflags/devel .cvsignore, 1.3, 1.4 gflags.spec, 1.6, 1.7 import.log, 1.2, 1.3 sources, 1.3, 1.4 gflags-1.0-gcc44.patch, 1.1, NONE
- Next message: rpms/svgalib/devel import.log, NONE, 1.1 svgalib-1.9.25-round_gtf_gtfcalc_c.patch, NONE, 1.1 svgalib.spec, 1.14, 1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list