Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f32f7e5 authored by Alexey Dobriyan's avatar Alexey Dobriyan
Browse files

proc: move /proc/buddyinfo boilerplate to mm/vmstat.c

parent 5f6a6a9c
Loading
Loading
Loading
Loading
+0 −14
Original line number Diff line number Diff line
@@ -57,19 +57,6 @@
#include <asm/div64.h>
#include "internal.h"

static int fragmentation_open(struct inode *inode, struct file *file)
{
	(void)inode;
	return seq_open(file, &fragmentation_op);
}

static const struct file_operations fragmentation_file_operations = {
	.open		= fragmentation_open,
	.read		= seq_read,
	.llseek		= seq_lseek,
	.release	= seq_release,
};

static int pagetypeinfo_open(struct inode *inode, struct file *file)
{
	return seq_open(file, &pagetypeinfo_op);
@@ -270,7 +257,6 @@ void __init proc_misc_init(void)
	proc_symlink("mounts", NULL, "self/mounts");

	/* And now for trickier ones */
	proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
	proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
	proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
	proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT,
		NR_VM_EVENT_ITEMS
};

extern const struct seq_operations fragmentation_op;
extern const struct seq_operations pagetypeinfo_op;
extern const struct seq_operations zoneinfo_op;
extern const struct seq_operations vmstat_op;
+21 −4
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@
 *  Copyright (C) 2006 Silicon Graphics, Inc.,
 *		Christoph Lameter <christoph@lameter.com>
 */

#include <linux/fs.h>
#include <linux/mm.h>
#include <linux/err.h>
#include <linux/module.h>
@@ -384,7 +384,7 @@ void zone_statistics(struct zone *preferred_zone, struct zone *z)
#endif

#ifdef CONFIG_PROC_FS

#include <linux/proc_fs.h>
#include <linux/seq_file.h>

static char * const migratetype_names[MIGRATE_TYPES] = {
@@ -581,13 +581,25 @@ static int pagetypeinfo_show(struct seq_file *m, void *arg)
	return 0;
}

const struct seq_operations fragmentation_op = {
static const struct seq_operations fragmentation_op = {
	.start	= frag_start,
	.next	= frag_next,
	.stop	= frag_stop,
	.show	= frag_show,
};

static int fragmentation_open(struct inode *inode, struct file *file)
{
	return seq_open(file, &fragmentation_op);
}

static const struct file_operations fragmentation_file_operations = {
	.open		= fragmentation_open,
	.read		= seq_read,
	.llseek		= seq_lseek,
	.release	= seq_release,
};

const struct seq_operations pagetypeinfo_op = {
	.start	= frag_start,
	.next	= frag_next,
@@ -898,9 +910,11 @@ static int __cpuinit vmstat_cpuup_callback(struct notifier_block *nfb,

static struct notifier_block __cpuinitdata vmstat_notifier =
	{ &vmstat_cpuup_callback, NULL, 0 };
#endif

static int __init setup_vmstat(void)
{
#ifdef CONFIG_SMP
	int cpu;

	refresh_zone_stat_thresholds();
@@ -908,7 +922,10 @@ static int __init setup_vmstat(void)

	for_each_online_cpu(cpu)
		start_cpu_timer(cpu);
#endif
#ifdef CONFIG_PROC_FS
	proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
#endif
	return 0;
}
module_init(setup_vmstat)
#endif