rpms/kernel/devel kernel-2.6.spec, 1.2732, 1.2733 linux-2.6-ppc64-export-copypage.patch, 1.1, 1.2
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Oct 3 18:05:15 UTC 2006
- Previous message (by thread): rpms/kernel/devel linux-2.6-ide-jmicron-fixup.patch, NONE, 1.1 kernel-2.6.spec, 1.2731, 1.2732
- Next message (by thread): rpms/openssh/FC-5 openssh-3.9p1-cve-2006-5051.patch, NONE, 1.1 openssh-4.3p2-cve-2006-4924.patch, NONE, 1.1 openssh-4.3p2-gssapi-no-spnego.patch, 1.1, 1.2 openssh.spec, 1.91, 1.92
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: davej
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7786
Modified Files:
kernel-2.6.spec linux-2.6-ppc64-export-copypage.patch
Log Message:
Use upstream variant of fix for PPC copypage exports.
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2732
retrieving revision 1.2733
diff -u -r1.2732 -r1.2733
--- kernel-2.6.spec 3 Oct 2006 18:03:06 -0000 1.2732
+++ kernel-2.6.spec 3 Oct 2006 18:05:12 -0000 1.2733
@@ -1991,6 +1991,7 @@
- Fix nfs connectathon test6 regression.
- Fix breakage in /proc/*/smaps access control (#208589)
- Fix up Jmicron IDE PCI probing.
+- Use upstream variant of fix for PPC copypage exports.
* Tue Oct 3 2006 David Woodhouse <dwmw2 at redhat.com>
- Fix PCMCIA serial port suspend/resume
linux-2.6-ppc64-export-copypage.patch:
powerpc/kernel/ppc_ksyms.c | 6 ++++++
ppc/kernel/ppc_ksyms.c | 2 ++
2 files changed, 8 insertions(+)
Index: linux-2.6-ppc64-export-copypage.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-ppc64-export-copypage.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-ppc64-export-copypage.patch 12 Sep 2006 16:41:55 -0000 1.1
+++ linux-2.6-ppc64-export-copypage.patch 3 Oct 2006 18:05:12 -0000 1.2
@@ -1,25 +1,38 @@
-From: David Howells <dhowells at redhat.com>
-Export copy_4K_page() on ppc64 so that it can be used by CacheFiles.
+This adds a missing copy_page export for the powerpc and ppc arches.
-CacheFiles uses copy_page() which makes use of copy_4K_page() on ppc64 builds.
-
-This patch has been compile-tested to make sure that the complaint by the final
-module linker goes away when a kernel is being built.
-
-David
-
---- linux-2.6.17.ppc64/arch/powerpc/kernel/ppc_ksyms.c.orig 2006-09-12 01:44:47.000000000 -0400
-+++ linux-2.6.17.ppc64/arch/powerpc/kernel/ppc_ksyms.c 2006-09-12 09:49:55.000000000 -0400
-@@ -91,6 +91,9 @@ EXPORT_SYMBOL(__copy_tofrom_user);
- EXPORT_SYMBOL(__clear_user);
- EXPORT_SYMBOL(__strncpy_from_user);
+Signed-off-by: Frederik Deweerdt <frederik.deweerdt at gmail.com>
+Acked-by: Aristeu S. Rozanski F. <aris at cathedrallabs.org>
+---
+
+diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
+index 39d3bfc..23ccd5d 100644
+--- a/arch/powerpc/kernel/ppc_ksyms.c
++++ b/arch/powerpc/kernel/ppc_ksyms.c
+@@ -93,6 +93,12 @@ EXPORT_SYMBOL(__strncpy_from_user);
EXPORT_SYMBOL(__strnlen_user);
-+#ifdef CONFIG_PPC64
-+EXPORT_SYMBOL(copy_4K_page);
-+#endif
#ifndef __powerpc64__
++EXPORT_SYMBOL(copy_page);
++#else
++EXPORT_SYMBOL(copy_4K_page);
++#endif
++
++#ifndef __powerpc64__
EXPORT_SYMBOL(__ide_mm_insl);
-
+ EXPORT_SYMBOL(__ide_mm_outsw);
+ EXPORT_SYMBOL(__ide_mm_insw);
+diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c
+index d173540..3045cc3 100644
+--- a/arch/ppc/kernel/ppc_ksyms.c
++++ b/arch/ppc/kernel/ppc_ksyms.c
+@@ -106,6 +106,8 @@ EXPORT_SYMBOL(__clear_user);
+ EXPORT_SYMBOL(__strncpy_from_user);
+ EXPORT_SYMBOL(__strnlen_user);
+
++EXPORT_SYMBOL(copy_page);
++
+ /*
+ EXPORT_SYMBOL(inb);
+ EXPORT_SYMBOL(inw);
- Previous message (by thread): rpms/kernel/devel linux-2.6-ide-jmicron-fixup.patch, NONE, 1.1 kernel-2.6.spec, 1.2731, 1.2732
- Next message (by thread): rpms/openssh/FC-5 openssh-3.9p1-cve-2006-5051.patch, NONE, 1.1 openssh-4.3p2-cve-2006-4924.patch, NONE, 1.1 openssh-4.3p2-gssapi-no-spnego.patch, 1.1, 1.2 openssh.spec, 1.91, 1.92
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list