summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDennis Gilmore <dennis@ausil.us>2011-01-05 14:36:33 -0600
committerDennis Gilmore <dennis@ausil.us>2011-01-05 14:36:33 -0600
commit1c442e5d3d82d64651f56e9f474543d2ca69febb (patch)
tree41c600cfcf9eb0cac1e183add56d434068b22084
parent973a30d1dbca2a64ffcf470acadaa3916b70ad44 (diff)
downloadkernel-1c442e5d3d82d64651f56e9f474543d2ca69febb.tar.gz
kernel-1c442e5d3d82d64651f56e9f474543d2ca69febb.tar.xz
kernel-1c442e5d3d82d64651f56e9f474543d2ca69febb.zip
add patch for sparc build failure
-rw-r--r--0001-use-__devexit-not-__exit-in-n2_unregister_algs-fixes.patch26
-rw-r--r--kernel.spec5
2 files changed, 31 insertions, 0 deletions
diff --git a/0001-use-__devexit-not-__exit-in-n2_unregister_algs-fixes.patch b/0001-use-__devexit-not-__exit-in-n2_unregister_algs-fixes.patch
new file mode 100644
index 000000000..a5c4c12dd
--- /dev/null
+++ b/0001-use-__devexit-not-__exit-in-n2_unregister_algs-fixes.patch
@@ -0,0 +1,26 @@
+From 56a2432f60ea0a0c85a93b0951ae8507e5b85270 Mon Sep 17 00:00:00 2001
+From: dennis <dennis@daedalus.ausil.us>
+Date: Wed, 5 Jan 2011 19:43:25 +0000
+Subject: [PATCH] use __devexit not __exit in n2_unregister_algs fixes build failure on fedora
+
+thanks to kylem for helping with debugging
+---
+ drivers/crypto/n2_core.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/crypto/n2_core.c b/drivers/crypto/n2_core.c
+index 88ee015..3372491 100644
+--- a/drivers/crypto/n2_core.c
++++ b/drivers/crypto/n2_core.c
+@@ -1542,7 +1542,7 @@ out:
+ return err;
+ }
+
+-static void __exit n2_unregister_algs(void)
++static void __devexit n2_unregister_algs(void)
+ {
+ mutex_lock(&spu_lock);
+ if (!--algs_registered)
+--
+1.6.6.1
+
diff --git a/kernel.spec b/kernel.spec
index a0ac5d9a8..516ffeb89 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -600,6 +600,7 @@ Patch31: linux-2.6-utrace.patch
Patch32: linux-2.6-utrace-ptrace.patch
Patch150: linux-2.6.29-sparc-IOC_TYPECHECK.patch
+Patch151: 0001-use-__devexit-not-__exit-in-n2_unregister_algs-fixes.patch
Patch160: linux-2.6-32bit-mmap-exec-randomization.patch
Patch161: linux-2.6-i386-nx-emulation.patch
@@ -1157,6 +1158,7 @@ ApplyPatch linux-2.6-utrace-ptrace.patch
# SPARC64
#
ApplyPatch linux-2.6.29-sparc-IOC_TYPECHECK.patch
+ApplyPatch 0001-use-__devexit-not-__exit-in-n2_unregister_algs-fixes.patch
#
# Exec shield
@@ -1951,6 +1953,9 @@ fi
# || ||
%changelog
+* Tue Jan 04 2011 Dennis Gilmore <dennis@ausil.us>
+- add patch for sparc build failure
+
* Tue Jan 04 2011 Kyle McMartin <kyle@redhat.com> 2.6.37-1
- Track release of 2.6.37