mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -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:
commit
88ed86fee6
56 changed files with 1263 additions and 1141 deletions
|
|
@ -10,6 +10,7 @@
|
|||
#include <linux/blkdev.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/proc_fs.h>
|
||||
#include <linux/seq_file.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/kmod.h>
|
||||
|
|
@ -727,12 +728,24 @@ static int show_partition(struct seq_file *seqf, void *v)
|
|||
return 0;
|
||||
}
|
||||
|
||||
const struct seq_operations partitions_op = {
|
||||
static const struct seq_operations partitions_op = {
|
||||
.start = show_partition_start,
|
||||
.next = disk_seqf_next,
|
||||
.stop = disk_seqf_stop,
|
||||
.show = show_partition
|
||||
};
|
||||
|
||||
static int partitions_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
return seq_open(file, &partitions_op);
|
||||
}
|
||||
|
||||
static const struct file_operations proc_partitions_operations = {
|
||||
.open = partitions_open,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = seq_release,
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
|
|
@ -992,12 +1005,32 @@ static int diskstats_show(struct seq_file *seqf, void *v)
|
|||
return 0;
|
||||
}
|
||||
|
||||
const struct seq_operations diskstats_op = {
|
||||
static const struct seq_operations diskstats_op = {
|
||||
.start = disk_seqf_start,
|
||||
.next = disk_seqf_next,
|
||||
.stop = disk_seqf_stop,
|
||||
.show = diskstats_show
|
||||
};
|
||||
|
||||
static int diskstats_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
return seq_open(file, &diskstats_op);
|
||||
}
|
||||
|
||||
static const struct file_operations proc_diskstats_operations = {
|
||||
.open = diskstats_open,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = seq_release,
|
||||
};
|
||||
|
||||
static int __init proc_genhd_init(void)
|
||||
{
|
||||
proc_create("diskstats", 0, NULL, &proc_diskstats_operations);
|
||||
proc_create("partitions", 0, NULL, &proc_partitions_operations);
|
||||
return 0;
|
||||
}
|
||||
module_init(proc_genhd_init);
|
||||
#endif /* CONFIG_PROC_FS */
|
||||
|
||||
static void media_change_notify_thread(struct work_struct *work)
|
||||
|
|
|
|||
Loading…
Reference in a new issue