r2055 - trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches
Joshua Kwan
joshk@haydn.debian.org
Sat, 25 Dec 2004 11:22:50 -0700
Author: joshk
Date: 2004-12-25 11:22:39 -0700 (Sat, 25 Dec 2004)
New Revision: 2055
Modified:
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc-warning-fixes.dpatch
Log:
no __iomem definition in 2.6.8.1, oops
Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc-warning-fixes.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc-warning-fixes.dpatch 2004-12-25 00:29:56 UTC (rev 2054)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc-warning-fixes.dpatch 2004-12-25 18:22:39 UTC (rev 2055)
@@ -1,139 +1,3 @@
-Index: wli-2.6.10-rc3-1/include/asm-sparc/pcic.h
-===================================================================
---- wli-2.6.10-rc3-1.orig/include/asm-sparc/pcic.h 2004-06-15 22:19:13.000000000 -0700
-+++ wli-2.6.10-rc3-1/include/asm-sparc/pcic.h 2004-12-22 10:08:27.597121906 -0800
-@@ -16,10 +16,10 @@
- #include <asm/pbm.h>
-
- struct linux_pcic {
-- unsigned long pcic_regs;
-+ void * __iomem pcic_regs;
- unsigned long pcic_io;
-- unsigned long pcic_config_space_addr;
-- unsigned long pcic_config_space_data;
-+ void * __iomem pcic_config_space_addr;
-+ void * __iomem pcic_config_space_data;
- struct resource pcic_res_regs;
- struct resource pcic_res_io;
- struct resource pcic_res_cfg_addr;
-Index: wli-2.6.10-rc3-1/arch/sparc/kernel/pcic.c
-===================================================================
---- wli-2.6.10-rc3-1.orig/arch/sparc/kernel/pcic.c 2004-12-16 06:19:27.000000000 -0800
-+++ wli-2.6.10-rc3-1/arch/sparc/kernel/pcic.c 2004-12-22 10:08:27.604120842 -0800
-@@ -161,7 +161,7 @@
- static int pcic0_up;
- static struct linux_pcic pcic0;
-
--unsigned int pcic_regs;
-+void * __iomem pcic_regs;
- volatile int pcic_speculative;
- volatile int pcic_trapped;
-
-@@ -313,8 +313,7 @@
- pcic0_up = 1;
-
- pcic->pcic_res_regs.name = "pcic_registers";
-- pcic->pcic_regs = (unsigned long)
-- ioremap(regs[0].phys_addr, regs[0].reg_size);
-+ pcic->pcic_regs = ioremap(regs[0].phys_addr, regs[0].reg_size);
- if (!pcic->pcic_regs) {
- prom_printf("PCIC: Error, cannot map PCIC registers.\n");
- prom_halt();
-@@ -328,7 +327,7 @@
- }
-
- pcic->pcic_res_cfg_addr.name = "pcic_cfg_addr";
-- if ((pcic->pcic_config_space_addr = (unsigned long)
-+ if ((pcic->pcic_config_space_addr =
- ioremap(regs[2].phys_addr, regs[2].reg_size * 2)) == 0) {
- prom_printf("PCIC: Error, cannot map"
- "PCI Configuration Space Address.\n");
-@@ -340,7 +339,7 @@
- * must be the same. Thus, we need adjust size of data.
- */
- pcic->pcic_res_cfg_data.name = "pcic_cfg_data";
-- if ((pcic->pcic_config_space_data = (unsigned long)
-+ if ((pcic->pcic_config_space_data =
- ioremap(regs[3].phys_addr, regs[3].reg_size * 2)) == 0) {
- prom_printf("PCIC: Error, cannot map"
- "PCI Configuration Space Data.\n");
-@@ -976,7 +975,7 @@
- * We do not use horroble macroses here because we want to
- * advance pointer by sizeof(size).
- */
--void outsb(unsigned long addr, const void *src, unsigned long count) {
-+void outsb(void * __iomem addr, const void *src, unsigned long count) {
- while (count) {
- count -= 1;
- writeb(*(const char *)src, addr);
-@@ -985,7 +984,7 @@
- }
- }
-
--void outsw(unsigned long addr, const void *src, unsigned long count) {
-+void outsw(void * __iomem addr, const void *src, unsigned long count) {
- while (count) {
- count -= 2;
- writew(*(const short *)src, addr);
-@@ -994,7 +993,7 @@
- }
- }
-
--void outsl(unsigned long addr, const void *src, unsigned long count) {
-+void outsl(void * __iomem addr, const void *src, unsigned long count) {
- while (count) {
- count -= 4;
- writel(*(const long *)src, addr);
-@@ -1003,7 +1002,7 @@
- }
- }
-
--void insb(unsigned long addr, void *dst, unsigned long count) {
-+void insb(void * __iomem addr, void *dst, unsigned long count) {
- while (count) {
- count -= 1;
- *(unsigned char *)dst = readb(addr);
-@@ -1012,7 +1011,7 @@
- }
- }
-
--void insw(unsigned long addr, void *dst, unsigned long count) {
-+void insw(void * __iomem addr, void *dst, unsigned long count) {
- while (count) {
- count -= 2;
- *(unsigned short *)dst = readw(addr);
-@@ -1021,7 +1020,7 @@
- }
- }
-
--void insl(unsigned long addr, void *dst, unsigned long count) {
-+void insl(void * __iomem addr, void *dst, unsigned long count) {
- while (count) {
- count -= 4;
- /*
-Index: wli-2.6.10-rc3-1/include/asm-sparc/io.h
-===================================================================
---- wli-2.6.10-rc3-1.orig/include/asm-sparc/io.h 2004-12-16 06:20:01.000000000 -0800
-+++ wli-2.6.10-rc3-1/include/asm-sparc/io.h 2004-12-22 10:08:27.606120538 -0800
-@@ -134,12 +134,12 @@
- #define inl_p(__addr) inl(__addr)
- #define outl_p(__l, __addr) outl(__l, __addr)
-
--extern void outsb(unsigned long addr, const void *src, unsigned long cnt);
--extern void outsw(unsigned long addr, const void *src, unsigned long cnt);
--extern void outsl(unsigned long addr, const void *src, unsigned long cnt);
--extern void insb(unsigned long addr, void *dst, unsigned long count);
--extern void insw(unsigned long addr, void *dst, unsigned long count);
--extern void insl(unsigned long addr, void *dst, unsigned long count);
-+void outsb(void * __iomem addr, const void *src, unsigned long cnt);
-+void outsw(void * __iomem addr, const void *src, unsigned long cnt);
-+void outsl(void * __iomem addr, const void *src, unsigned long cnt);
-+void insb(void * __iomem addr, void *dst, unsigned long count);
-+void insw(void * __iomem addr, void *dst, unsigned long count);
-+void insl(void * __iomem addr, void *dst, unsigned long count);
-
- #define IO_SPACE_LIMIT 0xffffffff
-
Index: wli-2.6.10-rc3-1/drivers/char/rtc.c
===================================================================
--- wli-2.6.10-rc3-1.orig/drivers/char/rtc.c 2004-10-07 04:01:30.000000000 -0700
@@ -147,36 +11,6 @@
static irqreturn_t (*rtc_int_handler_ptr)(int irq, void *dev_id, struct pt_regs *regs);
#endif
-Index: wli-2.6.10-rc3-1/drivers/sbus/char/rtc.c
-===================================================================
---- wli-2.6.10-rc3-1.orig/drivers/sbus/char/rtc.c 2004-10-07 04:01:41.000000000 -0700
-+++ wli-2.6.10-rc3-1/drivers/sbus/char/rtc.c 2004-12-22 10:09:09.744714498 -0800
-@@ -20,6 +20,7 @@
- #include <linux/poll.h>
- #include <linux/init.h>
- #include <linux/smp_lock.h>
-+#include <asm/io.h>
- #include <asm/mostek.h>
- #include <asm/system.h>
- #include <asm/uaccess.h>
-@@ -30,7 +31,7 @@
- /* Retrieve the current date and time from the real time clock. */
- static void get_rtc_time(struct rtc_time *t)
- {
-- unsigned long regs = mstk48t02_regs;
-+ void * __iomem regs = mstk48t02_regs;
- u8 tmp;
-
- spin_lock_irq(&mostek_lock);
-@@ -57,7 +58,7 @@
- /* Set the current date and time inthe real time clock. */
- void set_rtc_time(struct rtc_time *t)
- {
-- unsigned long regs = mstk48t02_regs;
-+ void * __iomem regs = mstk48t02_regs;
- u8 tmp;
-
- spin_lock_irq(&mostek_lock);
Index: wli-2.6.10-rc3-1/include/asm-sparc/unistd.h
===================================================================
--- wli-2.6.10-rc3-1.orig/include/asm-sparc/unistd.h 2004-12-16 06:20:01.000000000 -0800