o Merge with Linux 2.1.91.

 o First round of bugfixes for the SC/MC CPUs.
 o FPU context switch fixes.
 o Lazy context switches.
 o Faster syscalls.
 o Removed dead code.
 o Shitloads of other things I forgot ...

3 files changed, 14 insertions, 18 deletions

diff --git a/arch/m68k/atari/atakeyb.c b/arch/m68k/atari/atakeyb.c
index bf792da5c..8c512a714 100644
--- a/arch/m68k/atari/atakeyb.c
+++ b/arch/m68k/atari/atakeyb.c
@@ -117,7 +117,7 @@ static u_short ataplain_map[NR_KEYS] __initdata = {
 	0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200
 };
 
-static u_short atashift_map[NR_KEYS] = {
+static u_short atashift_map[NR_KEYS] __initdata = {
 	0xf200, 0xf01b, 0xf021, 0xf040, 0xf023, 0xf024, 0xf025, 0xf05e,
 	0xf026, 0xf02a, 0xf028, 0xf029, 0xf05f, 0xf02b, 0xf008, 0xf009,
 	0xfb51, 0xfb57, 0xfb45, 0xfb52, 0xfb54, 0xfb59, 0xfb55, 0xfb49,
@@ -136,7 +136,7 @@ static u_short atashift_map[NR_KEYS] = {
 	0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200
 };
 
-static u_short atactrl_map[NR_KEYS] = {
+static u_short atactrl_map[NR_KEYS] __initdata = {
 	0xf200, 0xf200, 0xf200, 0xf000, 0xf01b, 0xf01c, 0xf01d, 0xf01e,
 	0xf01f, 0xf07f, 0xf200, 0xf200, 0xf01f, 0xf200, 0xf008, 0xf200,
 	0xf011, 0xf017, 0xf005, 0xf012, 0xf014, 0xf019, 0xf015, 0xf009,
@@ -155,7 +155,7 @@ static u_short atactrl_map[NR_KEYS] = {
 	0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200
 };
 
-static u_short atashift_ctrl_map[NR_KEYS] = {
+static u_short atashift_ctrl_map[NR_KEYS] __initdata = {
 	0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200,
 	0xf200, 0xf200, 0xf200, 0xf200, 0xf01f, 0xf200, 0xf008, 0xf200,
 	0xf011, 0xf017, 0xf005, 0xf012, 0xf014, 0xf019, 0xf015, 0xf009,
@@ -174,7 +174,7 @@ static u_short atashift_ctrl_map[NR_KEYS] = {
 	0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200
 };
 
-static u_short ataalt_map[NR_KEYS] = {
+static u_short ataalt_map[NR_KEYS] __initdata = {
 	0xf200, 0xf81b, 0xf831, 0xf832, 0xf833, 0xf834, 0xf835, 0xf836,
 	0xf837, 0xf838, 0xf839, 0xf830, 0xf82d, 0xf83d, 0xf808, 0xf809,
 	0xf871, 0xf877, 0xf865, 0xf872, 0xf874, 0xf879, 0xf875, 0xf869,
@@ -212,7 +212,7 @@ static u_short atashift_alt_map[NR_KEYS] = {
 	0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200, 0xf200
 };
 
-static u_short atactrl_alt_map[NR_KEYS] = {
+static u_short atactrl_alt_map[NR_KEYS] __initdata = {
 	0xf200, 0xf200, 0xf200, 0xf800, 0xf81b, 0xf81c, 0xf81d, 0xf81e,
 	0xf81f, 0xf87f, 0xf200, 0xf200, 0xf81f, 0xf200, 0xf808, 0xf200,
 	0xf811, 0xf817, 0xf805, 0xf812, 0xf814, 0xf819, 0xf815, 0xf809,
@@ -767,14 +767,14 @@ void atari_kbd_leds (unsigned int leds)
 __initfunc(int atari_keyb_init(void))
 {
     /* setup key map */
-    memcpy (plain_map, ataplain_map, sizeof(plain_map));
-    key_maps[1]  = atashift_map;
+    memcpy(plain_map, ataplain_map, sizeof(plain_map));
+    memcpy(shift_map, atashift_map, sizeof(shift_map));
     key_maps[2]  = 0; /* ataaltgr_map */
-    key_maps[4]  = atactrl_map;
-    key_maps[5]  = atashift_ctrl_map;
-    key_maps[8]  = ataalt_map;
+    memcpy(ctrl_map, atactrl_map, sizeof(ctrl_map));
+    memcpy(shift_ctrl_map, atashift_ctrl_map, sizeof(shift_ctrl_map));
+    memcpy(alt_map, ataalt_map, sizeof(alt_map));
     key_maps[9]  = atashift_alt_map;
-    key_maps[12] = atactrl_alt_map;
+    memcpy(ctrl_alt_map, atactrl_alt_map, sizeof(ctrl_alt_map));
     key_maps[13] = atashift_ctrl_alt_map;
     keymap_count = 8;
 
diff --git a/arch/m68k/atari/atari_ksyms.c b/arch/m68k/atari/atari_ksyms.c
index 86e34fb7f..bd22bf672 100644
--- a/arch/m68k/atari/atari_ksyms.c
+++ b/arch/m68k/atari/atari_ksyms.c
@@ -1,5 +1,5 @@
+#include <linux/config.h>
 #include <linux/module.h>
-#include <linux/pci.h>
 
 #include <asm/ptrace.h>
 #include <asm/traps.h>
@@ -42,7 +42,3 @@ EXPORT_SYMBOL(ikbd_mouse_rel_pos);
 EXPORT_SYMBOL(ikbd_mouse_disable);
 
 EXPORT_SYMBOL(atari_microwire_cmd);
-
-#if CONFIG_PCI
-EXPORT_SYMBOL(pci_devices);
-#endif
diff --git a/arch/m68k/atari/time.c b/arch/m68k/atari/time.c
index 1e81eb18e..8a3921c8d 100644
--- a/arch/m68k/atari/time.c
+++ b/arch/m68k/atari/time.c
@@ -83,14 +83,14 @@ static void mste_write(struct MSTE_RTC *val)
 
 #define	RTC_READ(reg)				\
     ({	unsigned char	__val;			\
-		outb(reg,&tt_rtc.regsel);	\
+		writeb(reg,&tt_rtc.regsel);	\
 		__val = tt_rtc.data;		\
 		__val;				\
 	})
 
 #define	RTC_WRITE(reg,val)			\
     do {					\
-		outb(reg,&tt_rtc.regsel);	\
+		writeb(reg,&tt_rtc.regsel);	\
 		tt_rtc.data = (val);		\
 	} while(0)