patch-1.3.96 linux/drivers/char/mem.c

Next file: linux/drivers/char/misc.c
Previous file: linux/drivers/char/lp_m68k.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.95/linux/drivers/char/mem.c linux/drivers/char/mem.c
@@ -53,7 +53,7 @@
 	if (count > high_memory - p)
 		count = high_memory - p;
 	read = 0;
-#if defined(__i386__)		/* we don't have page 0 mapped on x86.. */
+#if defined(__i386__) || defined(__sparc__) /* we don't have page 0 mapped on x86/sparc.. */
 	while (p < PAGE_OFFSET + PAGE_SIZE && count > 0) {
 		put_user(0,buf);
 		buf++;
@@ -81,7 +81,7 @@
 	if (count > high_memory - p)
 		count = high_memory - p;
 	written = 0;
-#if defined(__i386__)		/* we don't have page 0 mapped on x86.. */
+#if defined(__i386__) || defined(__sparc__) /* we don't have page 0 mapped on x86/sparc.. */
 	while (PAGE_OFFSET + p < PAGE_SIZE && count > 0) {
 		/* Hmm. Do something? */
 		buf++;
@@ -390,7 +390,7 @@
 #if defined (CONFIG_BUSMOUSE) || defined(CONFIG_UMISC) || \
     defined (CONFIG_PSMOUSE) || defined (CONFIG_MS_BUSMOUSE) || \
     defined (CONFIG_ATIXL_BUSMOUSE) || defined(CONFIG_SOFT_WATCHDOG) || \
-    defined (CONFIG_APM) || defined (CONFIG_RTC)
+    defined (CONFIG_APM) || defined (CONFIG_RTC) || defined (CONFIG_SUN_MOUSE)
 	misc_init();
 #endif
 #ifdef CONFIG_SOUND

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this