The patch titled
zoned vm counters: remove unused get_page_stat functions
has been removed from the -mm tree. Its filename is
zoned-vm-counters-remove-unused-get_page_stat-functions.patch
This patch was dropped because it had testing failures
------------------------------------------------------
Subject: zoned vm counters: remove unused get_page_stat functions
From: Christoph Lameter <clameter@xxxxxxx>
Remove get_page_state functions / structures
We can remove all the get_page_state related functions after all the basic
page state variables have been moved to the zone based scheme.
The last patch broke the compile. This fixed it.
Signed-off-by: Christoph Lameter <clameter@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/base/node.c | 2 --
fs/proc/proc_misc.c | 2 --
include/linux/page-flags.h | 4 ----
mm/page_alloc.c | 24 ------------------------
4 files changed, 32 deletions(-)
diff -puN drivers/base/node.c~zoned-vm-counters-remove-unused-get_page_stat-functions drivers/base/node.c
--- devel/drivers/base/node.c~zoned-vm-counters-remove-unused-get_page_stat-functions 2006-06-09 15:17:45.000000000 -0700
+++ devel-akpm/drivers/base/node.c 2006-06-09 15:17:45.000000000 -0700
@@ -40,7 +40,6 @@ static ssize_t node_read_meminfo(struct
int n;
int nid = dev->id;
struct sysinfo i;
- struct page_state ps;
unsigned long inactive;
unsigned long active;
unsigned long free;
@@ -48,7 +47,6 @@ static ssize_t node_read_meminfo(struct
unsigned long nr[NR_STAT_ITEMS];
si_meminfo_node(&i, nid);
- get_page_state_node(&ps, nid);
__get_zone_counts(&active, &inactive, &free, NODE_DATA(nid));
for (j = 0; j < NR_STAT_ITEMS; j++)
nr[j] = node_page_state(nid, j);
diff -puN fs/proc/proc_misc.c~zoned-vm-counters-remove-unused-get_page_stat-functions fs/proc/proc_misc.c
--- devel/fs/proc/proc_misc.c~zoned-vm-counters-remove-unused-get_page_stat-functions 2006-06-09 15:17:45.000000000 -0700
+++ devel-akpm/fs/proc/proc_misc.c 2006-06-09 15:17:45.000000000 -0700
@@ -120,7 +120,6 @@ static int meminfo_read_proc(char *page,
{
struct sysinfo i;
int len;
- struct page_state ps;
unsigned long inactive;
unsigned long active;
unsigned long free;
@@ -129,7 +128,6 @@ static int meminfo_read_proc(char *page,
struct vmalloc_info vmi;
long cached;
- get_page_state(&ps);
get_zone_counts(&active, &inactive, &free);
/*
diff -puN include/linux/page-flags.h~zoned-vm-counters-remove-unused-get_page_stat-functions include/linux/page-flags.h
--- devel/include/linux/page-flags.h~zoned-vm-counters-remove-unused-get_page_stat-functions 2006-06-09 15:17:45.000000000 -0700
+++ devel-akpm/include/linux/page-flags.h 2006-06-09 15:17:45.000000000 -0700
@@ -117,8 +117,6 @@
* commented here.
*/
struct page_state {
-#define GET_PAGE_STATE_LAST xxx
-
/*
* The below are zeroed by get_page_state(). Use get_full_page_state()
* to add up all these.
@@ -171,8 +169,6 @@ struct page_state {
unsigned long nr_bounce; /* pages for bounce buffers */
};
-extern void get_page_state(struct page_state *ret);
-extern void get_page_state_node(struct page_state *ret, int node);
extern void get_full_page_state(struct page_state *ret);
extern unsigned long read_page_state_offset(unsigned long offset);
extern void mod_page_state_offset(unsigned long offset, unsigned long delta);
diff -puN mm/page_alloc.c~zoned-vm-counters-remove-unused-get_page_stat-functions mm/page_alloc.c
--- devel/mm/page_alloc.c~zoned-vm-counters-remove-unused-get_page_stat-functions 2006-06-09 15:17:45.000000000 -0700
+++ devel-akpm/mm/page_alloc.c 2006-06-09 15:17:45.000000000 -0700
@@ -1540,28 +1540,6 @@ static void __get_page_state(struct page
}
}
-void get_page_state_node(struct page_state *ret, int node)
-{
- int nr;
- cpumask_t mask = node_to_cpumask(node);
-
- nr = offsetof(struct page_state, GET_PAGE_STATE_LAST);
- nr /= sizeof(unsigned long);
-
- __get_page_state(ret, nr+1, &mask);
-}
-
-void get_page_state(struct page_state *ret)
-{
- int nr;
- cpumask_t mask = CPU_MASK_ALL;
-
- nr = offsetof(struct page_state, GET_PAGE_STATE_LAST);
- nr /= sizeof(unsigned long);
-
- __get_page_state(ret, nr + 1, &mask);
-}
-
void get_full_page_state(struct page_state *ret)
{
cpumask_t mask = CPU_MASK_ALL;
@@ -1677,7 +1655,6 @@ void si_meminfo_node(struct sysinfo *val
*/
void show_free_areas(void)
{
- struct page_state ps;
int cpu, temperature;
unsigned long active;
unsigned long inactive;
@@ -1709,7 +1686,6 @@ void show_free_areas(void)
}
}
- get_page_state(&ps);
get_zone_counts(&active, &inactive, &free);
printk("Free pages: %11ukB (%ukB HighMem)\n",
_
Patches currently in -mm which might be from clameter@xxxxxxx are
page-migration-make-do_swap_page-redo-the-fault.patch
slab-extract-cache_free_alien-from-__cache_free.patch
migration-remove-unnecessary-pageswapcache-checks.patch
page-migration-cleanup-rename-ignrefs-to-migration.patch
page-migration-cleanup-group-functions.patch
page-migration-cleanup-remove-useless-definitions.patch
page-migration-cleanup-drop-nr_refs-in-remove_references.patch
page-migration-cleanup-extract-try_to_unmap-from-migration-functions.patch
page-migration-cleanup-pass-mapping-to-migration-functions.patch
page-migration-cleanup-move-fallback-handling-into-special-function.patch
swapless-pm-add-r-w-migration-entries.patch
swapless-page-migration-rip-out-swap-based-logic.patch
swapless-page-migration-modify-core-logic.patch
more-page-migration-do-not-inc-dec-rss-counters.patch
more-page-migration-use-migration-entries-for-file-pages.patch
page-migration-update-documentation.patch
mm-remove-vm_locked-before-remap_pfn_range-and-drop-vm_shm.patch
page-migration-simplify-migrate_pages.patch
page-migration-simplify-migrate_pages-tweaks.patch
page-migration-handle-freeing-of-pages-in-migrate_pages.patch
page-migration-use-allocator-function-for-migrate_pages.patch
page-migration-support-moving-of-individual-pages.patch
page-migration-detailed-status-for-moving-of-individual-pages.patch
page-migration-support-moving-of-individual-pages-fixes.patch
page-migration-support-moving-of-individual-pages-x86_64-support.patch
page-migration-support-moving-of-individual-pages-x86-support.patch
page-migration-support-a-vma-migration-function.patch
allow-migration-of-mlocked-pages.patch
cpuset-remove-extra-cpuset_zone_allowed-check-in-__alloc_pages.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
