GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-04-29 17:53:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[PATCH] Drop get_zone_counts()

Browse source 
Values are available via ZVC sums.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Christoph Lameter 2007-02-10 01:43:05 -08:00 • committed by Linus Torvalds
parent 05a0416be2
commit 65e458d43d
3 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
fs/proc/proc_misc.c
View file

@ -121,16 +121,11 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
{ {
struct sysinfo i; struct sysinfo i;
int len; int len;
unsigned long inactive;
unsigned long active;
unsigned long free;
unsigned long committed; unsigned long committed;
unsigned long allowed; unsigned long allowed;
struct vmalloc_info vmi; struct vmalloc_info vmi;
long cached; long cached;
get_zone_counts(&active, &inactive, &free);
/* /*
* display in kilobytes. * display in kilobytes.
*/ */
@ -187,8 +182,8 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
K(i.bufferram), K(i.bufferram),
K(cached), K(cached),
K(total_swapcache_pages), K(total_swapcache_pages),
K(active), K(global_page_state(NR_ACTIVE)),
K(inactive), K(global_page_state(NR_INACTIVE)),
#ifdef CONFIG_HIGHMEM #ifdef CONFIG_HIGHMEM
K(i.totalhigh), K(i.totalhigh),
K(i.freehigh), K(i.freehigh),

9
mm/page_alloc.c
View file

@ -1524,9 +1524,6 @@ void si_meminfo_node(struct sysinfo *val, int nid)
void show_free_areas(void) void show_free_areas(void)
{ {
int cpu; int cpu;
unsigned long active;
unsigned long inactive;
unsigned long free;
struct zone *zone; struct zone *zone;
for_each_zone(zone) { for_each_zone(zone) {
@ -1550,12 +1547,10 @@ void show_free_areas(void)
} }
} }
get_zone_counts(&active, &inactive, &free);
printk("Active:%lu inactive:%lu dirty:%lu writeback:%lu unstable:%lu\n" printk("Active:%lu inactive:%lu dirty:%lu writeback:%lu unstable:%lu\n"
" free:%lu slab:%lu mapped:%lu pagetables:%lu bounce:%lu\n", " free:%lu slab:%lu mapped:%lu pagetables:%lu bounce:%lu\n",
active, global_page_state(NR_ACTIVE),
inactive, global_page_state(NR_INACTIVE),
global_page_state(NR_FILE_DIRTY), global_page_state(NR_FILE_DIRTY),
global_page_state(NR_WRITEBACK), global_page_state(NR_WRITEBACK),
global_page_state(NR_UNSTABLE_NFS), global_page_state(NR_UNSTABLE_NFS),

8
mm/vmstat.c
View file

@ -13,14 +13,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/cpu.h> #include <linux/cpu.h>
void get_zone_counts(unsigned long *active,
unsigned long *inactive, unsigned long *free)
{
*active = global_page_state(NR_ACTIVE);
*inactive = global_page_state(NR_INACTIVE);
*free = global_page_state(NR_FREE_PAGES);
}
#ifdef CONFIG_VM_EVENT_COUNTERS #ifdef CONFIG_VM_EVENT_COUNTERS
DEFINE_PER_CPU(struct vm_event_state, vm_event_states) = {{0}}; DEFINE_PER_CPU(struct vm_event_state, vm_event_states) = {{0}};
EXPORT_PER_CPU_SYMBOL(vm_event_states); EXPORT_PER_CPU_SYMBOL(vm_event_states);