mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge branch 'proc' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc
* 'proc' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc: (35 commits) proc: remove fs/proc/proc_misc.c proc: move /proc/vmcore creation to fs/proc/vmcore.c proc: move pagecount stuff to fs/proc/page.c proc: move all /proc/kcore stuff to fs/proc/kcore.c proc: move /proc/schedstat boilerplate to kernel/sched_stats.h proc: move /proc/modules boilerplate to kernel/module.c proc: move /proc/diskstats boilerplate to block/genhd.c proc: move /proc/zoneinfo boilerplate to mm/vmstat.c proc: move /proc/vmstat boilerplate to mm/vmstat.c proc: move /proc/pagetypeinfo boilerplate to mm/vmstat.c proc: move /proc/buddyinfo boilerplate to mm/vmstat.c proc: move /proc/vmallocinfo to mm/vmalloc.c proc: move /proc/slabinfo boilerplate to mm/slub.c, mm/slab.c proc: move /proc/slab_allocators boilerplate to mm/slab.c proc: move /proc/interrupts boilerplate code to fs/proc/interrupts.c proc: move /proc/stat to fs/proc/stat.c proc: move rest of /proc/partitions code to block/genhd.c proc: move /proc/cpuinfo code to fs/proc/cpuinfo.c proc: move /proc/devices code to fs/proc/devices.c proc: move rest of /proc/locks to fs/locks.c ...
This commit is contained in:
Linus Torvalds
commit
88ed86fee6
56 changed files with 1263 additions and 1141 deletions
|
|
@ -7,6 +7,7 @@
|
|||
#include <linux/init.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/mm.h>
|
||||
#include <linux/seq_file.h>
|
||||
#include <linux/sysctl.h>
|
||||
#include <linux/highmem.h>
|
||||
#include <linux/mmu_notifier.h>
|
||||
|
|
@ -1455,10 +1456,10 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
|
|||
|
||||
#endif /* CONFIG_SYSCTL */
|
||||
|
||||
int hugetlb_report_meminfo(char *buf)
|
||||
void hugetlb_report_meminfo(struct seq_file *m)
|
||||
{
|
||||
struct hstate *h = &default_hstate;
|
||||
return sprintf(buf,
|
||||
seq_printf(m,
|
||||
"HugePages_Total: %5lu\n"
|
||||
"HugePages_Free: %5lu\n"
|
||||
"HugePages_Rsvd: %5lu\n"
|
||||
|
|
|
|||
52
mm/slab.c
52
mm/slab.c
|
|
@ -95,6 +95,7 @@
|
|||
#include <linux/init.h>
|
||||
#include <linux/compiler.h>
|
||||
#include <linux/cpuset.h>
|
||||
#include <linux/proc_fs.h>
|
||||
#include <linux/seq_file.h>
|
||||
#include <linux/notifier.h>
|
||||
#include <linux/kallsyms.h>
|
||||
|
|
@ -4258,7 +4259,7 @@ static int s_show(struct seq_file *m, void *p)
|
|||
* + further values on SMP and with statistics enabled
|
||||
*/
|
||||
|
||||
const struct seq_operations slabinfo_op = {
|
||||
static const struct seq_operations slabinfo_op = {
|
||||
.start = s_start,
|
||||
.next = s_next,
|
||||
.stop = s_stop,
|
||||
|
|
@ -4315,6 +4316,19 @@ ssize_t slabinfo_write(struct file *file, const char __user * buffer,
|
|||
return res;
|
||||
}
|
||||
|
||||
static int slabinfo_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
return seq_open(file, &slabinfo_op);
|
||||
}
|
||||
|
||||
static const struct file_operations proc_slabinfo_operations = {
|
||||
.open = slabinfo_open,
|
||||
.read = seq_read,
|
||||
.write = slabinfo_write,
|
||||
.llseek = seq_lseek,
|
||||
.release = seq_release,
|
||||
};
|
||||
|
||||
#ifdef CONFIG_DEBUG_SLAB_LEAK
|
||||
|
||||
static void *leaks_start(struct seq_file *m, loff_t *pos)
|
||||
|
|
@ -4443,13 +4457,47 @@ static int leaks_show(struct seq_file *m, void *p)
|
|||
return 0;
|
||||
}
|
||||
|
||||
const struct seq_operations slabstats_op = {
|
||||
static const struct seq_operations slabstats_op = {
|
||||
.start = leaks_start,
|
||||
.next = s_next,
|
||||
.stop = s_stop,
|
||||
.show = leaks_show,
|
||||
};
|
||||
|
||||
static int slabstats_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
unsigned long *n = kzalloc(PAGE_SIZE, GFP_KERNEL);
|
||||
int ret = -ENOMEM;
|
||||
if (n) {
|
||||
ret = seq_open(file, &slabstats_op);
|
||||
if (!ret) {
|
||||
struct seq_file *m = file->private_data;
|
||||
*n = PAGE_SIZE / (2 * sizeof(unsigned long));
|
||||
m->private = n;
|
||||
n = NULL;
|
||||
}
|
||||
kfree(n);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
static const struct file_operations proc_slabstats_operations = {
|
||||
.open = slabstats_open,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = seq_release_private,
|
||||
};
|
||||
#endif
|
||||
|
||||
static int __init slab_proc_init(void)
|
||||
{
|
||||
proc_create("slabinfo",S_IWUSR|S_IRUGO,NULL,&proc_slabinfo_operations);
|
||||
#ifdef CONFIG_DEBUG_SLAB_LEAK
|
||||
proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
module_init(slab_proc_init);
|
||||
#endif
|
||||
|
||||
/**
|
||||
|
|
|
|||
29
mm/slub.c
29
mm/slub.c
|
|
@ -14,6 +14,7 @@
|
|||
#include <linux/interrupt.h>
|
||||
#include <linux/bitops.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/proc_fs.h>
|
||||
#include <linux/seq_file.h>
|
||||
#include <linux/cpu.h>
|
||||
#include <linux/cpuset.h>
|
||||
|
|
@ -4417,14 +4418,6 @@ __initcall(slab_sysfs_init);
|
|||
* The /proc/slabinfo ABI
|
||||
*/
|
||||
#ifdef CONFIG_SLABINFO
|
||||
|
||||
ssize_t slabinfo_write(struct file *file, const char __user *buffer,
|
||||
size_t count, loff_t *ppos)
|
||||
{
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
||||
static void print_slabinfo_header(struct seq_file *m)
|
||||
{
|
||||
seq_puts(m, "slabinfo - version: 2.1\n");
|
||||
|
|
@ -4492,11 +4485,29 @@ static int s_show(struct seq_file *m, void *p)
|
|||
return 0;
|
||||
}
|
||||
|
||||
const struct seq_operations slabinfo_op = {
|
||||
static const struct seq_operations slabinfo_op = {
|
||||
.start = s_start,
|
||||
.next = s_next,
|
||||
.stop = s_stop,
|
||||
.show = s_show,
|
||||
};
|
||||
|
||||
static int slabinfo_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
return seq_open(file, &slabinfo_op);
|
||||
}
|
||||
|
||||
static const struct file_operations proc_slabinfo_operations = {
|
||||
.open = slabinfo_open,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = seq_release,
|
||||
};
|
||||
|
||||
static int __init slab_proc_init(void)
|
||||
{
|
||||
proc_create("slabinfo",S_IWUSR|S_IRUGO,NULL,&proc_slabinfo_operations);
|
||||
return 0;
|
||||
}
|
||||
module_init(slab_proc_init);
|
||||
#endif /* CONFIG_SLABINFO */
|
||||
|
|
|
|||
33
mm/vmalloc.c
33
mm/vmalloc.c
|
|
@ -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
|
||||
|
||||
|
|
|
|||
69
mm/vmstat.c
69
mm/vmstat.c
|
|
@ -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,20 +581,44 @@ 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,
|
||||
};
|
||||
|
||||
const struct seq_operations pagetypeinfo_op = {
|
||||
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,
|
||||
};
|
||||
|
||||
static const struct seq_operations pagetypeinfo_op = {
|
||||
.start = frag_start,
|
||||
.next = frag_next,
|
||||
.stop = frag_stop,
|
||||
.show = pagetypeinfo_show,
|
||||
};
|
||||
|
||||
static int pagetypeinfo_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
return seq_open(file, &pagetypeinfo_op);
|
||||
}
|
||||
|
||||
static const struct file_operations pagetypeinfo_file_ops = {
|
||||
.open = pagetypeinfo_open,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = seq_release,
|
||||
};
|
||||
|
||||
#ifdef CONFIG_ZONE_DMA
|
||||
#define TEXT_FOR_DMA(xx) xx "_dma",
|
||||
#else
|
||||
|
|
@ -771,7 +795,7 @@ static int zoneinfo_show(struct seq_file *m, void *arg)
|
|||
return 0;
|
||||
}
|
||||
|
||||
const struct seq_operations zoneinfo_op = {
|
||||
static const struct seq_operations zoneinfo_op = {
|
||||
.start = frag_start, /* iterate over all zones. The same as in
|
||||
* fragmentation. */
|
||||
.next = frag_next,
|
||||
|
|
@ -779,6 +803,18 @@ const struct seq_operations zoneinfo_op = {
|
|||
.show = zoneinfo_show,
|
||||
};
|
||||
|
||||
static int zoneinfo_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
return seq_open(file, &zoneinfo_op);
|
||||
}
|
||||
|
||||
static const struct file_operations proc_zoneinfo_file_operations = {
|
||||
.open = zoneinfo_open,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = seq_release,
|
||||
};
|
||||
|
||||
static void *vmstat_start(struct seq_file *m, loff_t *pos)
|
||||
{
|
||||
unsigned long *v;
|
||||
|
|
@ -834,13 +870,24 @@ static void vmstat_stop(struct seq_file *m, void *arg)
|
|||
m->private = NULL;
|
||||
}
|
||||
|
||||
const struct seq_operations vmstat_op = {
|
||||
static const struct seq_operations vmstat_op = {
|
||||
.start = vmstat_start,
|
||||
.next = vmstat_next,
|
||||
.stop = vmstat_stop,
|
||||
.show = vmstat_show,
|
||||
};
|
||||
|
||||
static int vmstat_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
return seq_open(file, &vmstat_op);
|
||||
}
|
||||
|
||||
static const struct file_operations proc_vmstat_file_operations = {
|
||||
.open = vmstat_open,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = seq_release,
|
||||
};
|
||||
#endif /* CONFIG_PROC_FS */
|
||||
|
||||
#ifdef CONFIG_SMP
|
||||
|
|
@ -898,9 +945,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 +957,13 @@ 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);
|
||||
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);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
module_init(setup_vmstat)
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue