rpms/kernel/FC-5 linux-2.6-ppc32-check-legacy-io.patch, NONE, 1.1 kernel-2.6.spec, 1.2100, 1.2101
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Apr 25 12:22:49 UTC 2006
- Previous message (by thread): rpms/tar/FC-5 tar-1.15.90-makeCheck.patch, NONE, 1.1 tar-1.15.90.tar.gz.sig, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.8, 1.9 tar.spec, 1.32, 1.33 tar-1.15.1-gcc4.patch, 1.1, NONE tar-1.15.1-heapOverflow.patch, 1.1, NONE tar-1.15.1-lseek.patch, 1.1, NONE tar-1.15.1-makeCheck.patch, 1.2, NONE tar-1.15.1-newerOption.patch, 1.1, NONE tar-1.15.1-padCorrectly.patch, 1.1, NONE tar-1.15.1-sparseTotals.patch, 1.1, NONE tar-1.15.1.tar.gz.sig, 1.1, NONE
- Next message (by thread): rpms/cups/FC-5 cups-includeifexists.patch, NONE, 1.1 cups.spec, 1.162, 1.163 pdftops.conf, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dwmw2
Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv23637
Modified Files:
kernel-2.6.spec
Added Files:
linux-2.6-ppc32-check-legacy-io.patch
Log Message:
Don't poke at legacy I/O on Mac32
linux-2.6-ppc32-check-legacy-io.patch:
arch/powerpc/kernel/setup-common.c | 8 ++++++++
arch/powerpc/kernel/setup_64.c | 8 --------
drivers/block/floppy.c | 2 +-
drivers/input/serio/i8042-io.h | 4 ++--
include/asm-powerpc/io.h | 6 +++---
5 files changed, 14 insertions(+), 14 deletions(-)
--- NEW FILE linux-2.6-ppc32-check-legacy-io.patch ---
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 1d93e73..684ab1d 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -469,3 +469,11 @@ static int __init early_xmon(char *p)
}
early_param("xmon", early_xmon);
#endif
+
+int check_legacy_ioport(unsigned long base_port)
+{
+ if (ppc_md.check_legacy_ioport == NULL)
+ return 0;
+ return ppc_md.check_legacy_ioport(base_port);
+}
+EXPORT_SYMBOL(check_legacy_ioport);
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 13e91c4..4467c49 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -594,14 +594,6 @@ void ppc64_terminate_msg(unsigned int sr
printk("[terminate]%04x %s\n", src, msg);
}
-int check_legacy_ioport(unsigned long base_port)
-{
- if (ppc_md.check_legacy_ioport == NULL)
- return 0;
- return ppc_md.check_legacy_ioport(base_port);
-}
-EXPORT_SYMBOL(check_legacy_ioport);
-
void cpu_die(void)
{
if (ppc_md.cpu_die)
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index bedb689..dff1e67 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4301,7 +4301,7 @@ #endif
}
use_virtual_dma = can_use_virtual_dma & 1;
-#if defined(CONFIG_PPC64)
+#if defined(CONFIG_PPC_MERGE)
if (check_legacy_ioport(FDC1)) {
del_timer(&fd_timeout);
err = -ENODEV;
diff --git a/drivers/input/serio/i8042-io.h b/drivers/input/serio/i8042-io.h
index 9a92216..cc21914 100644
--- a/drivers/input/serio/i8042-io.h
+++ b/drivers/input/serio/i8042-io.h
@@ -67,14 +67,14 @@ static inline int i8042_platform_init(vo
* On some platforms touching the i8042 data register region can do really
* bad things. Because of this the region is always reserved on such boxes.
*/
-#if !defined(__sh__) && !defined(__alpha__) && !defined(__mips__) && !defined(CONFIG_PPC64)
+#if !defined(__sh__) && !defined(__alpha__) && !defined(__mips__) && !defined(CONFIG_PPC_MERGE)
if (!request_region(I8042_DATA_REG, 16, "i8042"))
return -EBUSY;
#endif
i8042_reset = 1;
-#if defined(CONFIG_PPC64)
+#if defined(CONFIG_PPC_MERGE)
if (check_legacy_ioport(I8042_DATA_REG))
return -EBUSY;
if (!request_region(I8042_DATA_REG, 16, "i8042"))
diff --git a/include/asm-powerpc/io.h b/include/asm-powerpc/io.h
index 68efbea..f1c2469 100644
--- a/include/asm-powerpc/io.h
+++ b/include/asm-powerpc/io.h
@@ -9,6 +9,9 @@ #ifdef __KERNEL__
* 2 of the License, or (at your option) any later version.
*/
+/* Check of existence of legacy devices */
+extern int check_legacy_ioport(unsigned long base_port);
+
#ifndef CONFIG_PPC64
#include <asm-ppc/io.h>
#else
@@ -437,9 +440,6 @@ #define dma_cache_inv(_start,_size) do
#define dma_cache_wback(_start,_size) do { } while (0)
#define dma_cache_wback_inv(_start,_size) do { } while (0)
-/* Check of existence of legacy devices */
-extern int check_legacy_ioport(unsigned long base_port);
-
/*
* Convert a physical pointer to a virtual kernel pointer for /dev/mem
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2100
retrieving revision 1.2101
diff -u -r1.2100 -r1.2101
--- kernel-2.6.spec 25 Apr 2006 04:30:17 -0000 1.2100
+++ kernel-2.6.spec 25 Apr 2006 12:22:46 -0000 1.2101
@@ -241,6 +241,7 @@
Patch313: linux-2.6-hvc-rtas-console.patch
Patch314: linux-2.6-ppc-rtas-check.patch
Patch317: linux-2.6-ppc-iseries-input-layer.patch
+Patch318: linux-2.6-ppc32-check-legacy-io.patch
# 400 - 499 ia64
# 500 - 599 s390(x)
@@ -786,6 +787,8 @@
%patch314 -p1
# No input layer on iseries
%patch317 -p1
+# check_legacy_ioport() on ppc32
+%patch318 -p1
#
# Xen
@@ -1694,6 +1697,9 @@
%endif
%changelog
+* Tue Apr 25 2006 David Woodhouse <dwmw2 at redhat.com>
+- Use check_legacy_ioport() even on 32-bit PPC kernel
+
* Tue Apr 25 2006 Dave Jones <davej at redhat.com>
- Enable DVB in the 586 kernel. (#188227)
- Fix up SCSI errors with mymusix usb mp3 player (#186187)
- Previous message (by thread): rpms/tar/FC-5 tar-1.15.90-makeCheck.patch, NONE, 1.1 tar-1.15.90.tar.gz.sig, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.8, 1.9 tar.spec, 1.32, 1.33 tar-1.15.1-gcc4.patch, 1.1, NONE tar-1.15.1-heapOverflow.patch, 1.1, NONE tar-1.15.1-lseek.patch, 1.1, NONE tar-1.15.1-makeCheck.patch, 1.2, NONE tar-1.15.1-newerOption.patch, 1.1, NONE tar-1.15.1-padCorrectly.patch, 1.1, NONE tar-1.15.1-sparseTotals.patch, 1.1, NONE tar-1.15.1.tar.gz.sig, 1.1, NONE
- Next message (by thread): rpms/cups/FC-5 cups-includeifexists.patch, NONE, 1.1 cups.spec, 1.162, 1.163 pdftops.conf, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list