patch-2.4.0-test6 linux/include/asm-sh/pgtable.h

• Lines: 63
• Date: Wed Aug 9 13:59:04 2000
• Orig file: v2.4.0-test5/linux/include/asm-sh/pgtable.h
• Orig date: Fri Jun 23 21:55:11 2000

diff -u --recursive --new-file v2.4.0-test5/linux/include/asm-sh/pgtable.h linux/include/asm-sh/pgtable.h
@@ -23,6 +23,7 @@
  *  - flush_cache_page(mm, vmaddr) flushes a single page
  *  - flush_cache_range(mm, start, end) flushes a range of pages
  *
+ *  - flush_dcache_page(pg) flushes(wback&invalidates) a page for dcache
  *  - flush_page_to_ram(page) write back kernel page to ram
  *  - flush_icache_range(start, end) flushes(invalidates) a range for icache
  *  - flush_icache_page(vma, pg) flushes(invalidates) a page for icache
@@ -35,6 +36,7 @@
 #define flush_cache_range(mm, start, end)	do { } while (0)
 #define flush_cache_page(vma, vmaddr)		do { } while (0)
 #define flush_page_to_ram(page)			do { } while (0)
+#define flush_dcache_page(page)			do { } while (0)
 #define flush_icache_range(start, end)		do { } while (0)
 #define flush_icache_page(vma,pg)		do { } while (0)
 #elif defined(__SH4__)
@@ -47,6 +49,7 @@
 			      unsigned long end);
 extern void flush_cache_page(struct vm_area_struct *vma, unsigned long addr);
 extern void flush_page_to_ram(struct page *page);
+extern void flush_dcache_page(struct page *pg);
 extern void flush_icache_range(unsigned long start, unsigned long end);
 extern void flush_icache_page(struct vm_area_struct *vma, struct page *pg);
 #endif
@@ -61,7 +64,7 @@
  * for zero-mapped memory areas etc..
  */
 extern unsigned long empty_zero_page[1024];
-#define ZERO_PAGE(vaddr) (mem_map + MAP_NR(empty_zero_page))
+#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
 
 #endif /* !__ASSEMBLY__ */
 
@@ -98,6 +101,9 @@
 #define _PAGE_USER	0x040  /* PR1-bit : user space access allowed */
 #define _PAGE_PROTNONE	0x080  /* software: if not present */
 /*			0x100     V-bit   : page is valid */
+/*			0x200     can be used as software flag */
+/*			0x400     can be used as software flag */
+/*			0x800     can be used as software flag */
 
 #if defined(__sh3__)
 /* Mask which drop software flags */
@@ -155,7 +161,6 @@
 #define pte_none(x)	(!pte_val(x))
 #define pte_present(x)	(pte_val(x) & (_PAGE_PRESENT | _PAGE_PROTNONE))
 #define pte_clear(xp)	do { set_pte(xp, __pte(0)); } while (0)
-#define pte_pagenr(x)	((unsigned long)(((pte_val(x) -__MEMORY_START) >> PAGE_SHIFT)))
 
 #define pmd_none(x)	(!pmd_val(x))
 #define pmd_present(x)	(pmd_val(x) & _PAGE_PRESENT)
@@ -166,9 +171,9 @@
  * Permanent address of a page. Obviously must never be
  * called on a highmem page.
  */
-#define page_address(page) ({ if (!(page)->virtual) BUG(); (page)->virtual; })
+#define page_address(page)  ((page)->virtual)
 #define pages_to_mb(x) ((x) >> (20-PAGE_SHIFT))
-#define pte_page(x) (mem_map+pte_pagenr(x))
+#define pte_page(x) (mem_map+(unsigned long)(((pte_val(x) -__MEMORY_START) >> PAGE_SHIFT)))
 
 /*
  * The following only work if pte_present() is true.