patch-2.4.0-test5 linux/include/linux/mm.h

• Lines: 83
• Date: Thu Jul 27 17:02:02 2000
• Orig file: v2.4.0-test4/linux/include/linux/mm.h
• Orig date: Fri Jul 14 12:12:15 2000

diff -u --recursive --new-file v2.4.0-test4/linux/include/linux/mm.h linux/include/linux/mm.h
@@ -52,8 +52,8 @@
 	struct vm_area_struct * vm_avl_left;
 	struct vm_area_struct * vm_avl_right;
 
-	/* For areas with inode, the list inode->i_mmap, for shm areas,
-	 * the list of attaches, otherwise unused.
+	/* For areas with inode, the list inode->i_mapping->i_mmap, 
+	 * for shm areas, the list of attaches, otherwise unused.
 	 */
 	struct vm_area_struct *vm_next_share;
 	struct vm_area_struct **vm_pprev_share;
@@ -327,18 +327,10 @@
 extern struct page * alloc_pages(int gfp_mask, unsigned long order);
 #endif /* !CONFIG_DISCONTIGMEM */
 
-#define alloc_page(gfp_mask) \
-		alloc_pages(gfp_mask, 0)
+#define alloc_page(gfp_mask) alloc_pages(gfp_mask, 0)
 
-static inline unsigned long __get_free_pages (int gfp_mask, unsigned long order)
-{
-	struct page * page;
-
-	page = alloc_pages(gfp_mask, order);
-	if (!page)
-		return 0;
-	return page_address(page);
-}
+extern unsigned long FASTCALL(__get_free_pages(int gfp_mask, unsigned long order));
+extern unsigned long FASTCALL(get_zeroed_page(int gfp_mask));
 
 #define __get_free_page(gfp_mask) \
 		__get_free_pages((gfp_mask),0)
@@ -346,16 +338,6 @@
 #define __get_dma_pages(gfp_mask, order) \
 		__get_free_pages((gfp_mask) | GFP_DMA,(order))
 
-static inline unsigned long get_zeroed_page(int gfp_mask)
-{
-	unsigned long page;
-
-	page = __get_free_page(gfp_mask);
-	if (page)
-		clear_page((void *)page);
-	return page;
-}
-
 /*
  * The old interface name will be removed in 2.5:
  */
@@ -364,29 +346,10 @@
 /*
  * There is only one 'core' page-freeing function.
  */
-extern void FASTCALL(__free_pages_ok(struct page * page, unsigned long order));
-
-static inline void __free_pages(struct page *page, unsigned long order)
-{
-	if (!put_page_testzero(page))
-		return;
-	__free_pages_ok(page, order);
-}
-
-#define __free_page(page) __free_pages(page, 0)
-
-static inline void free_pages(unsigned long addr, unsigned long order)
-{
-	unsigned long map_nr;
-
-#ifdef CONFIG_DISCONTIGMEM
-	if (addr == 0) return;
-#endif
-	map_nr = MAP_NR(addr);
-	if (map_nr < max_mapnr)
-		__free_pages(mem_map + map_nr, order);
-}
+extern void FASTCALL(__free_pages(struct page *page, unsigned long order));
+extern void FASTCALL(free_pages(unsigned long addr, unsigned long order));
 
+#define __free_page(page) __free_pages((page), 0)
 #define free_page(addr) free_pages((addr),0)
 
 extern void show_free_areas(void);