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

Commit 5f6a6a9c authored by Alexey Dobriyan's avatar Alexey Dobriyan
Browse files

proc: move /proc/vmallocinfo to mm/vmalloc.c 



Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Acked-by: default avatarChristoph Lameter <cl@linux-foundation.org>
parent 7b3c3a50

fs/proc/proc_misc.c

+0 −28
Original line number Diff line number Diff line
@@ -132,31 +132,6 @@ static const struct file_operations proc_modules_operations = { 
};

#endif



#ifdef CONFIG_MMU

static int vmalloc_open(struct inode *inode, struct file *file)

{

	unsigned int *ptr = NULL;

	int ret;



	if (NUMA_BUILD)

		ptr = kmalloc(nr_node_ids * sizeof(unsigned int), GFP_KERNEL);

	ret = seq_open(file, &vmalloc_op);

	if (!ret) {

		struct seq_file *m = file->private_data;

		m->private = ptr;

	} else

		kfree(ptr);

	return ret;

}



static const struct file_operations proc_vmalloc_operations = {

	.open		= vmalloc_open,

	.read		= seq_read,

	.llseek		= seq_lseek,

	.release	= seq_release_private,

};

#endif



#ifdef CONFIG_PROC_PAGE_MONITOR

#define KPMSIZE sizeof(u64)

#define KPMMASK (KPMSIZE - 1)
@@ -295,9 +270,6 @@ void __init proc_misc_init(void) 
	proc_symlink("mounts", NULL, "self/mounts");



	/* And now for trickier ones */

#ifdef CONFIG_MMU

	proc_create("vmallocinfo", S_IRUSR, NULL, &proc_vmalloc_operations);

#endif

	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);

include/linux/vmalloc.h

+0 −2
Original line number Diff line number Diff line
@@ -103,6 +103,4 @@ extern void free_vm_area(struct vm_struct *area); 
extern rwlock_t vmlist_lock;

extern struct vm_struct *vmlist;



extern const struct seq_operations vmalloc_op;



#endif /* _LINUX_VMALLOC_H */

mm/vmalloc.c

+32 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/slab.h>

#include <linux/spinlock.h>

#include <linux/interrupt.h>

#include <linux/proc_fs.h>

#include <linux/seq_file.h>

#include <linux/debugobjects.h>

#include <linux/kallsyms.h>
@@ -1718,11 +1719,41 @@ static int s_show(struct seq_file *m, void *p) 
	return 0;

}



const struct seq_operations vmalloc_op = {

static const struct seq_operations vmalloc_op = {

	.start = s_start,

	.next = s_next,

	.stop = s_stop,

	.show = s_show,

};



static int vmalloc_open(struct inode *inode, struct file *file)

{

	unsigned int *ptr = NULL;

	int ret;



	if (NUMA_BUILD)

		ptr = kmalloc(nr_node_ids * sizeof(unsigned int), GFP_KERNEL);

	ret = seq_open(file, &vmalloc_op);

	if (!ret) {

		struct seq_file *m = file->private_data;

		m->private = ptr;

	} else

		kfree(ptr);

	return ret;

}



static const struct file_operations proc_vmalloc_operations = {

	.open		= vmalloc_open,

	.read		= seq_read,

	.llseek		= seq_lseek,

	.release	= seq_release_private,

};



static int __init proc_vmalloc_init(void)

{

	proc_create("vmallocinfo", S_IRUSR, NULL, &proc_vmalloc_operations);

	return 0;

}

module_init(proc_vmalloc_init);

#endif