aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
Diffstat (limited to 'mm')
-rw-r--r--mm/readahead.c8
-rw-r--r--mm/vmstat.c8
2 files changed, 2 insertions, 14 deletions
diff --git a/mm/readahead.c b/mm/readahead.c
index 0f539e8e827a..93d9ee692fd8 100644
--- a/mm/readahead.c
+++ b/mm/readahead.c
@@ -575,10 +575,6 @@ void handle_ra_miss(struct address_space *mapping,
575 */ 575 */
576unsigned long max_sane_readahead(unsigned long nr) 576unsigned long max_sane_readahead(unsigned long nr)
577{ 577{
578 unsigned long active; 578 return min(nr, (node_page_state(numa_node_id(), NR_INACTIVE)
579 unsigned long inactive; 579 + node_page_state(numa_node_id(), NR_FREE_PAGES)) / 2);
580 unsigned long free;
581
582 __get_zone_counts(&active, &inactive, &free, NODE_DATA(numa_node_id()));
583 return min(nr, (inactive + free) / 2);
584} 580}
diff --git a/mm/vmstat.c b/mm/vmstat.c
index 2ee7ec5e003f..21ba6f88b35c 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -13,14 +13,6 @@
13#include <linux/module.h> 13#include <linux/module.h>
14#include <linux/cpu.h> 14#include <linux/cpu.h>
15 15
16void __get_zone_counts(unsigned long *active, unsigned long *inactive,
17 unsigned long *free, struct pglist_data *pgdat)
18{
19 *active = node_page_state(pgdat->node_id, NR_ACTIVE);
20 *inactive = node_page_state(pgdat->node_id, NR_INACTIVE);
21 *free = node_page_state(pgdat->node_id, NR_FREE_PAGES);
22}
23
24void get_zone_counts(unsigned long *active, 16void get_zone_counts(unsigned long *active,
25 unsigned long *inactive, unsigned long *free) 17 unsigned long *inactive, unsigned long *free)
26{ 18{