[linuxsh-dev] 2.4.9

[NIIBE Y. <gn...@m1...>]

 > After that, I'll post some changes to follow the mainline.

Here it is:

	* include/asm-sh/keyboard.h (kbd_rate): New function.
	* include/asm-sh/io.h (page_to_bus): New macro.
	* include/asm-sh/mmzone.h (page_to_phys): Defined.

Index: include/asm-sh/io.h
===================================================================
RCS file: /cvsroot/linuxsh/kernel/include/asm-sh/io.h,v
retrieving revision 1.30
diff -u -r1.30 io.h
--- include/asm-sh/io.h	2001/08/11 01:23:28	1.30
+++ include/asm-sh/io.h	2001/08/17 01:01:10
@@ -405,6 +405,7 @@
 
 #define virt_to_bus virt_to_phys
 #define bus_to_virt phys_to_virt
+#define page_to_bus page_to_phys
 
 /*
  * readX/writeX() are used to access memory mapped devices. On some
Index: include/asm-sh/keyboard.h
===================================================================
RCS file: /cvsroot/linuxsh/kernel/include/asm-sh/keyboard.h,v
retrieving revision 1.10
diff -u -r1.10 keyboard.h
--- include/asm-sh/keyboard.h	2001/08/08 14:54:58	1.10
+++ include/asm-sh/keyboard.h	2001/08/17 01:01:10
@@ -4,6 +4,7 @@
  *	$Id: keyboard.h,v 1.10 2001/08/08 14:54:58 yaegashi Exp $
  */
 
+#include <linux/kd.h>
 #include <linux/config.h>
 #include <asm/machvec.h>
 
@@ -39,6 +40,10 @@
 }
 
 static __inline__ void kbd_leds(unsigned char leds)
+{
+}
+
+static __inline__ void kbd_rate(struct kbd_repeat *rep)
 {
 }
 
Index: include/asm-sh/mmzone.h
===================================================================
RCS file: /cvsroot/linuxsh/kernel/include/asm-sh/mmzone.h,v
retrieving revision 1.3
diff -u -r1.3 mmzone.h
--- include/asm-sh/mmzone.h	2001/08/09 23:52:16	1.3
+++ include/asm-sh/mmzone.h	2001/08/17 01:01:11
@@ -55,5 +55,7 @@
 }
 
 #define VALID_PAGE(page)	is_valid_page(page)
+#define page_to_phys(page)	PHYSADDR(page_address(page))
+
 #endif /* CONFIG_DISCONTIGMEM */
 #endif
Index: include/asm-sh/page.h
===================================================================
RCS file: /cvsroot/linuxsh/kernel/include/asm-sh/page.h,v
retrieving revision 1.12
diff -u -r1.12 page.h
--- include/asm-sh/page.h	2001/07/27 06:09:47	1.12
+++ include/asm-sh/page.h	2001/08/17 01:01:11
@@ -82,6 +82,7 @@
 #ifndef CONFIG_DISCONTIGMEM
 #define phys_to_page(phys)	(mem_map + (((phys)-__MEMORY_START) >> PAGE_SHIFT))
 #define VALID_PAGE(page)	((page - mem_map) < max_mapnr)
+#define page_to_phys(page)	(((page - mem_map) << PAGE_SHIFT) + __MEMORY_START)
 #endif
 
 #define virt_to_page(kaddr)	phys_to_page(__pa(kaddr))
--