patch-2.1.115 linux/include/asm-sparc64/page.h

• Lines: 85
• Date: Tue Aug 4 16:03:35 1998
• Orig file: v2.1.114/linux/include/asm-sparc64/page.h
• Orig date: Fri May 8 23:14:56 1998

diff -u --recursive --new-file v2.1.114/linux/include/asm-sparc64/page.h linux/include/asm-sparc64/page.h
@@ -1,4 +1,4 @@
-/* $Id: page.h,v 1.18 1998/05/01 09:33:50 davem Exp $ */
+/* $Id: page.h,v 1.23 1998/06/12 14:54:33 jj Exp $ */
 
 #ifndef _SPARC64_PAGE_H
 #define _SPARC64_PAGE_H
@@ -18,59 +18,7 @@
 
 #ifndef __ASSEMBLY__
 
-#define PAGE_ALIAS_BITS		(PAGE_SIZE)	/* 16K Dcache, 8K pages */
-#ifdef __SMP__
-#define ULOCK_DECLARE extern spinlock_t user_page_lock;
-#else
-#define ULOCK_DECLARE
-#endif
-struct upcache {
-	struct page *list;
-	unsigned long count;
-};
-extern struct upcache user_page_cache[2];
-#define USER_PAGE_WATER		16
-
-extern unsigned long get_user_page_slow(int which);
-#define get_user_page(__vaddr) \
-({ \
-	ULOCK_DECLARE \
-	int which = ((__vaddr) & PAGE_ALIAS_BITS) ? 1 : 0; \
-	struct upcache *up = &user_page_cache[which]; \
-	struct page *p; \
-	unsigned long ret; \
-	spin_lock(&user_page_lock); \
-	if((p = up->list) != NULL) { \
-		up->list = p->next; \
-		up->count--; \
-	} \
-	spin_unlock(&user_page_lock); \
-	if(p != NULL) \
-		ret = PAGE_OFFSET+PAGE_SIZE*p->map_nr; \
-	else \
-		ret = get_user_page_slow(which); \
-	ret; \
-})
-
-#define free_user_page(__page, __addr) \
-do { \
-	ULOCK_DECLARE \
-	int which = ((__addr) & PAGE_ALIAS_BITS) ? 1 : 0; \
-	struct upcache *up = &user_page_cache[which]; \
-	if(atomic_read(&(__page)->count) == 1 && \
-           up->count < USER_PAGE_WATER) { \
-		spin_lock(&user_page_lock); \
-		(__page)->age = PAGE_INITIAL_AGE; \
-		(__page)->next = up->list; \
-		up->list = (__page); \
-		up->count++; \
-		spin_unlock(&user_page_lock); \
-	} else \
-		free_page(addr); \
-} while(0)
-
-#define clear_page(page) memset((void *)(page), 0, PAGE_SIZE)
-
+#define clear_page(page)		memset((void *)(page), 0, PAGE_SIZE)
 extern void copy_page(unsigned long to, unsigned long from);
 
 /* GROSS, defining this makes gcc pass these types as aggregates,
@@ -133,15 +81,8 @@
 
 #endif /* (STRICT_MM_TYPECHECKS) */
 
-#define TASK_UNMAPPED_BASE(__off)	(((current->tss.flags & SPARC_FLAG_32BIT) ? \
-				 	 (0x0000000070000000UL) : \
-				 	 (0xfffff80000000000UL)) + \
-					 (__off & PAGE_SIZE))
-
-/* On Ultra this aligns to the size of the L1 cache. */
-#define TASK_UNMAPPED_ALIGN(__addr, __off) \
-	((((__addr)+((PAGE_SIZE<<1UL)-1UL)) & ~((PAGE_SIZE << 1UL)-1UL)) + \
-	 (__off&PAGE_SIZE))
+#define TASK_UNMAPPED_BASE	((current->tss.flags & SPARC_FLAG_32BIT) ? \
+				 (0x0000000070000000UL) : (PAGE_OFFSET))
 
 #endif /* !(__ASSEMBLY__) */