[LV-kern-commit] CVS: kernel-2.4/arch/sh/kernel io_7751se.c,1.1,1.2 pci-7751se.c,1.1,1.2 rtc.c,1.2,1.3 sh_ksyms.c,1.2,1.3 traps.c,1.2,1.3

[Dave A. <ai...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/arch/sh/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv23180/arch/sh/kernel

Modified Files:
	io_7751se.c pci-7751se.c rtc.c sh_ksyms.c traps.c 
Log Message:
DA: sync to Marcelo 2.4.18 + remove init_mmap (no longer needed)


Index: io_7751se.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sh/kernel/io_7751se.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- io_7751se.c	9 Apr 2002 17:07:20 -0000	1.1
+++ io_7751se.c	10 Jun 2003 01:46:15 -0000	1.2
@@ -17,7 +17,7 @@
 #include <asm/hitachi_7751se.h>
 #include <asm/addrspace.h>
 
-#include <asm/pci.h>
+#include <linux/pci.h>
 #include <asm/pci-sh7751.h>
 
 #if 0
@@ -70,7 +70,7 @@
 	else
 		return (volatile __u16 *) (PA_SUPERIO + (port << 1));
 #endif
-	maybebadio(name,port);
+	maybebadio(name,(unsigned long)port);
 	return (volatile __u16*)port;
 }
 
@@ -276,6 +276,7 @@
 /* ISA page descriptor.  */
 static __u32 sh_isa_memmap[256];
 
+#if 0
 static int
 sh_isa_mmap(__u32 start, __u32 length, __u32 offset)
 {
@@ -286,12 +287,11 @@
 
 	idx = start >> 12;
 	sh_isa_memmap[idx] = 0xb8000000 + (offset &~ 0xfff);
-#if 0
 	printk("sh_isa_mmap: start %x len %x offset %x (idx %x paddr %x)\n",
 	       start, length, offset, idx, sh_isa_memmap[idx]);
-#endif
 	return 0;
 }
+#endif
 
 unsigned long
 sh7751se_isa_port2addr(unsigned long offset)

Index: pci-7751se.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sh/kernel/pci-7751se.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pci-7751se.c	9 Apr 2002 17:07:20 -0000	1.1
+++ pci-7751se.c	10 Jun 2003 01:46:15 -0000	1.2
@@ -37,7 +37,6 @@
  */
 int __init pcibios_init_platform(void)
 {
-   unsigned long data;
    unsigned long bcr1, wcr1, wcr2, wcr3, mcr;
    unsigned short bcr2;
 

Index: rtc.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sh/kernel/rtc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rtc.c	9 Apr 2002 17:07:20 -0000	1.2
+++ rtc.c	10 Jun 2003 01:46:15 -0000	1.3
@@ -46,7 +46,7 @@
 	} while ((ctrl_inb(RCR1) & RCR1_CF) != 0);
 
 #if RTC_BIT_INVERTED != 0
-	/* Work around to avoid reading correct value. */
+	/* Work around to avoid reading incorrect value. */
 	if (sec128 == RTC_BIT_INVERTED) {
 		schedule_timeout(1);
 		goto again;
@@ -81,12 +81,18 @@
 		goto again;
 	}
 
+#if RTC_BIT_INVERTED != 0
+	if ((sec128 & RTC_BIT_INVERTED))
+		sec--;
+#endif
+
 	tv->tv_sec = mktime(yr100 * 100 + yr, mon, day, hr, min, sec);
-	tv->tv_usec = ((sec128 ^ RTC_BIT_INVERTED) * 1000000) / 128;
+	tv->tv_usec = (sec128 * 1000000) / 128;
 }
 
-static int set_rtc_time(unsigned long nowtime)
+int sh_rtc_settimeofday(const struct timeval *tv)
 {
+	unsigned long nowtime = tv->tv_sec;
 	int retval = 0;
 	int real_seconds, real_minutes, cmos_minutes;
 
@@ -122,13 +128,4 @@
 	ctrl_outb(RCR2_RTCEN|RCR2_START, RCR2);  /* Start RTC */
 
 	return retval;
-}
-
-int sh_rtc_settimeofday(const struct timeval *tv)
-{
-#if RTC_BIT_INVERTED != 0
-	/* This is not accurate, but better than nothing. */
-	schedule_timeout(HZ/2);
-#endif
-	return set_rtc_time(tv->tv_sec);
 }

Index: sh_ksyms.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sh/kernel/sh_ksyms.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sh_ksyms.c	9 Apr 2002 17:07:20 -0000	1.2
+++ sh_ksyms.c	10 Jun 2003 01:46:15 -0000	1.3
@@ -39,8 +39,6 @@
 /* Networking helper routines. */
 EXPORT_SYMBOL(csum_partial_copy);
 
-EXPORT_SYMBOL(simple_strtol);
-
 EXPORT_SYMBOL(strtok);
 EXPORT_SYMBOL(strpbrk);
 EXPORT_SYMBOL(strstr);

Index: traps.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sh/kernel/traps.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- traps.c	9 Apr 2002 17:07:20 -0000	1.2
+++ traps.c	10 Jun 2003 01:46:15 -0000	1.3
@@ -560,3 +560,8 @@
 		}
 	}
 }
+
+void show_trace_task(struct task_struct *tsk)
+{
+	printk("Backtrace not yet implemented for SH.\n");
+}