patch-2.3.99-pre6 linux/include/asm-sparc64/page.h

• Lines: 39
• Date: Fri Apr 14 09:37:10 2000
• Orig file: v2.3.99-pre5/linux/include/asm-sparc64/page.h
• Orig date: Mon Mar 27 08:08:31 2000

diff -u --recursive --new-file v2.3.99-pre5/linux/include/asm-sparc64/page.h linux/include/asm-sparc64/page.h
@@ -1,4 +1,4 @@
-/* $Id: page.h,v 1.33 2000/03/22 02:48:04 davem Exp $ */
+/* $Id: page.h,v 1.35 2000/04/13 04:45:59 davem Exp $ */
 
 #ifndef _SPARC64_PAGE_H
 #define _SPARC64_PAGE_H
@@ -21,8 +21,10 @@
 #define BUG()		__builtin_trap()
 #define PAGE_BUG(page)	BUG()
 
-extern void clear_page(void *page);
-extern void copy_page(void *to, void *from);
+extern void _clear_page(void *page);
+extern void _copy_page(void *to, void *from);
+#define clear_page(X)	_clear_page((void *)(X))
+#define copy_page(X,Y)	_copy_page((void *)(X), (void *)(Y))
 extern void clear_user_page(void *page, unsigned long vaddr);
 extern void copy_user_page(void *to, void *from, unsigned long vaddr);
 
@@ -103,7 +105,7 @@
 
 #define __pa(x)			((unsigned long)(x) - PAGE_OFFSET)
 #define __va(x)			((void *)((unsigned long) (x) + PAGE_OFFSET))
-#define MAP_NR(addr)		(__pa(addr) >> PAGE_SHIFT)
+#define MAP_NR(addr)		((__pa(addr)-phys_base) >> PAGE_SHIFT)
 
 #define virt_to_phys __pa
 #define phys_to_virt __va
@@ -119,8 +121,8 @@
  */
 
 struct sparc_phys_banks {
-  unsigned long base_addr;
-  unsigned long num_bytes;
+	unsigned long base_addr;
+	unsigned long num_bytes;
 };
 
 #define SPARC_PHYS_BANKS 32