patch-2.4.0-test6 linux/include/linux/highmem.h

• Lines: 71
• Date: Wed Aug 9 18:57:55 2000
• Orig file: v2.4.0-test5/linux/include/linux/highmem.h
• Orig date: Fri Jul 14 12:12:15 2000

diff -u --recursive --new-file v2.4.0-test5/linux/include/linux/highmem.h linux/include/linux/highmem.h
@@ -11,7 +11,6 @@
 #include <asm/highmem.h>
 
 /* declarations for linux/mm/highmem.c */
-extern unsigned long highmem_mapnr;
 FASTCALL(unsigned int nr_free_highpages(void));
 
 extern struct page * prepare_highmem_swapout(struct page *);
@@ -25,7 +24,7 @@
 #define replace_with_highmem(page) page
 
 static __inline__ unsigned long kmap(struct page * page) {
-	return page_address(page);
+	return (unsigned long) page_address(page);
 }
 
 #define kunmap(page) do { } while (0)
@@ -33,7 +32,7 @@
 #endif /* CONFIG_HIGHMEM */
 
 /* when CONFIG_HIGHMEM is not set these will be plain clear/copy_page */
-extern inline void clear_user_highpage(struct page *page, unsigned long vaddr)
+static inline void clear_user_highpage(struct page *page, unsigned long vaddr)
 {
 	unsigned long kaddr;
 
@@ -42,7 +41,7 @@
 	kunmap(page);
 }
 
-extern inline void clear_highpage(struct page *page)
+static inline void clear_highpage(struct page *page)
 {
 	unsigned long kaddr;
 
@@ -51,7 +50,7 @@
 	kunmap(page);
 }
 
-extern inline void memclear_highpage(struct page *page, unsigned int offset, unsigned int size)
+static inline void memclear_highpage(struct page *page, unsigned int offset, unsigned int size)
 {
 	unsigned long kaddr;
 
@@ -65,7 +64,7 @@
 /*
  * Same but also flushes aliased cache contents to RAM.
  */
-extern inline void memclear_highpage_flush(struct page *page, unsigned int offset, unsigned int size)
+static inline void memclear_highpage_flush(struct page *page, unsigned int offset, unsigned int size)
 {
 	unsigned long kaddr;
 
@@ -77,7 +76,7 @@
 	kunmap(page);
 }
 
-extern inline void copy_user_highpage(struct page *to, struct page *from, unsigned long vaddr)
+static inline void copy_user_highpage(struct page *to, struct page *from, unsigned long vaddr)
 {
 	unsigned long vfrom, vto;
 
@@ -88,7 +87,7 @@
 	kunmap(to);
 }
 
-extern inline void copy_highpage(struct page *to, struct page *from)
+static inline void copy_highpage(struct page *to, struct page *from)
 {
 	unsigned long vfrom, vto;