try_to_free_pages accepts a third argument, order, but hasn't used it
since before 2.6.0. The following patch removes the argument and
updates all the calls to try_to_free_pages.
Tested on a 4 way x86 box running kernbench. No problems detected.
Signed-off-by: Darren Hart <[email protected]>
diff -purN -X /home/dvhart/.diff.exclude /home/linux/views/linux-2.6.12-rc4/fs/buffer.c 2.6.12-rc4-order/fs/buffer.c
--- /home/linux/views/linux-2.6.12-rc4/fs/buffer.c 2005-05-06 23:22:28.000000000 -0700
+++ 2.6.12-rc4-order/fs/buffer.c 2005-05-18 11:52:05.000000000 -0700
@@ -528,7 +528,7 @@ static void free_more_memory(void)
for_each_pgdat(pgdat) {
zones = pgdat->node_zonelists[GFP_NOFS&GFP_ZONEMASK].zones;
if (*zones)
- try_to_free_pages(zones, GFP_NOFS, 0);
+ try_to_free_pages(zones, GFP_NOFS);
}
}
diff -purN -X /home/dvhart/.diff.exclude /home/linux/views/linux-2.6.12-rc4/include/linux/swap.h 2.6.12-rc4-order/include/linux/swap.h
--- /home/linux/views/linux-2.6.12-rc4/include/linux/swap.h 2005-05-06 23:22:33.000000000 -0700
+++ 2.6.12-rc4-order/include/linux/swap.h 2005-05-18 11:52:05.000000000 -0700
@@ -172,7 +172,7 @@ extern int rotate_reclaimable_page(struc
extern void swap_setup(void);
/* linux/mm/vmscan.c */
-extern int try_to_free_pages(struct zone **, unsigned int, unsigned int);
+extern int try_to_free_pages(struct zone **, unsigned int);
extern int shrink_all_memory(int);
extern int vm_swappiness;
diff -purN -X /home/dvhart/.diff.exclude /home/linux/views/linux-2.6.12-rc4/mm/page_alloc.c 2.6.12-rc4-order/mm/page_alloc.c
--- /home/linux/views/linux-2.6.12-rc4/mm/page_alloc.c 2005-05-06 23:22:34.000000000 -0700
+++ 2.6.12-rc4-order/mm/page_alloc.c 2005-05-18 11:52:05.000000000 -0700
@@ -829,7 +829,7 @@ rebalance:
reclaim_state.reclaimed_slab = 0;
p->reclaim_state = &reclaim_state;
- did_some_progress = try_to_free_pages(zones, gfp_mask, order);
+ did_some_progress = try_to_free_pages(zones, gfp_mask);
p->reclaim_state = NULL;
p->flags &= ~PF_MEMALLOC;
diff -purN -X /home/dvhart/.diff.exclude /home/linux/views/linux-2.6.12-rc4/mm/vmscan.c 2.6.12-rc4-order/mm/vmscan.c
--- /home/linux/views/linux-2.6.12-rc4/mm/vmscan.c 2005-05-06 23:22:34.000000000 -0700
+++ 2.6.12-rc4-order/mm/vmscan.c 2005-05-18 11:52:05.000000000 -0700
@@ -907,8 +907,7 @@ shrink_caches(struct zone **zones, struc
* holds filesystem locks which prevent writeout this might not work, and the
* allocation attempt will fail.
*/
-int try_to_free_pages(struct zone **zones,
- unsigned int gfp_mask, unsigned int order)
+int try_to_free_pages(struct zone **zones, unsigned int gfp_mask)
{
int priority;
int ret = 0;
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
