[Linuxconsole-commit]CVS: ruby/linux/include/asm-sparc64 page.h,1.1,1.2

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/include/asm-sparc64
In directory usw-pr-cvs1:/tmp/cvs-serv23561/include/asm-sparc64

Modified Files:
	page.h 
Log Message:
Synced to 2.5.X.

Index: page.h
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/include/asm-sparc64/page.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- page.h	2001/09/02 23:21:37	1.1
+++ page.h	2002/01/20 03:54:46	1.2
@@ -18,13 +18,19 @@
 
 #ifndef __ASSEMBLY__
 
-#define BUG()		bust_spinlocks(1); __builtin_trap();
+#ifdef CONFIG_DEBUG_BUGVERBOSE
+#define BUG() do {					\
+	do_BUG(__FILE__, __LINE__);			\
+	__builtin_trap();				\
+} while (0)
+#else
+#define BUG()		bust_spinlocks(1); __builtin_trap()
+#endif
+
 #define PAGE_BUG(page)	BUG()
 
 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);