patch-2.3.26 linux/include/asm-sh/page.h

• Lines: 35
• Date: Sat Nov 6 10:40:31 1999
• Orig file: v2.3.25/linux/include/asm-sh/page.h
• Orig date: Wed Oct 27 16:34:12 1999

diff -u --recursive --new-file v2.3.25/linux/include/asm-sh/page.h linux/include/asm-sh/page.h
@@ -39,9 +39,6 @@
 #define pgd_val(x)	((x).pgd)
 #define pgprot_val(x)	((x).pgprot)
 
-#define __pte(x)	((pte_t) { (x) } )
-#define __pmd(x)	((pmd_t) { (x) } )
-#define __pgd(x)	((pgd_t) { (x) } )
 #define __pgprot(x)	((pgprot_t) { (x) } )
 
 #endif /* !__ASSEMBLY__ */
@@ -56,13 +53,12 @@
  *
  * which has the same constant encoded..
  */
-#define __PAGE_OFFSET		(0x80000000)
 
 #define __MEMORY_START		CONFIG_MEMORY_START
 
-#define PAGE_OFFSET		((unsigned long)__PAGE_OFFSET+__MEMORY_START)
-#define __pa(x)			((unsigned long)(x)-__PAGE_OFFSET)
-#define __va(x)			((void *)((unsigned long)(x)+__PAGE_OFFSET))
+#define PAGE_OFFSET		(0x80000000)
+#define __pa(x)			((unsigned long)(x)-PAGE_OFFSET)
+#define __va(x)			((void *)((unsigned long)(x)+PAGE_OFFSET))
 #define MAP_NR(addr)		((__pa(addr)-__MEMORY_START) >> PAGE_SHIFT)
 
 #ifndef __ASSEMBLY__
@@ -74,7 +70,6 @@
  */
 #define BUG() do { \
 	printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
-	console_loglevel = 0; \
 	asm volatile("nop"); \
 } while (0)