Alan Cox
526719ba51
Switch to a valid email address...
...
Signed-off-by: Alan Cox <alan@redhat.com >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2008-10-27 08:40:17 -07:00
Linus Torvalds
88ed86fee6
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
...
2008-10-23 12:04:37 -07:00
Linus Torvalds
2248485640
Merge git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev
...
* git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev: (66 commits)
[PATCH] kill the rest of struct file propagation in block ioctls
[PATCH] get rid of struct file use in blkdev_ioctl() BLKBSZSET
[PATCH] get rid of blkdev_locked_ioctl()
[PATCH] get rid of blkdev_driver_ioctl()
[PATCH] sanitize blkdev_get() and friends
[PATCH] remember mode of reiserfs journal
[PATCH] propagate mode through swsusp_close()
[PATCH] propagate mode through open_bdev_excl/close_bdev_excl
[PATCH] pass fmode_t to blkdev_put()
[PATCH] kill the unused bsize on the send side of /dev/loop
[PATCH] trim file propagation in block/compat_ioctl.c
[PATCH] end of methods switch: remove the old ones
[PATCH] switch sr
[PATCH] switch sd
[PATCH] switch ide-scsi
[PATCH] switch tape_block
[PATCH] switch dcssblk
[PATCH] switch dasd
[PATCH] switch mtd_blkdevs
[PATCH] switch mmc
...
2008-10-23 10:23:07 -07:00
Alexey Dobriyan
59c7572e82
proc: remove fs/proc/proc_misc.c
...
Now that everything was moved to their more or less expected places,
apply rm(1).
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com >
2008-10-23 18:54:05 +04:00
Alexey Dobriyan
5aa140c2de
proc: move /proc/vmcore creation to fs/proc/vmcore.c
...
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com >
2008-10-23 18:51:22 +04:00
Alexey Dobriyan
6d80e53f00
proc: move pagecount stuff to fs/proc/page.c
...
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com >
2008-10-23 18:48:31 +04:00
Alexey Dobriyan
97ce5d6dcb
proc: move all /proc/kcore stuff to fs/proc/kcore.c
...
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com >
2008-10-23 18:32:38 +04:00
Alexey Dobriyan
b5aadf7f14
proc: move /proc/schedstat boilerplate to kernel/sched_stats.h
...
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com >
2008-10-23 18:06:12 +04:00
Alexey Dobriyan
3b5d5c6b0c
proc: move /proc/modules boilerplate to kernel/module.c
...
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com >
2008-10-23 18:03:13 +04:00
Alexey Dobriyan
31d85ab28e
proc: move /proc/diskstats boilerplate to block/genhd.c
...
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com >
Acked-by: Jens Axboe <jens.axboe@oracle.com >
2008-10-23 17:57:37 +04:00
Alexey Dobriyan
5c9fe6281b
proc: move /proc/zoneinfo boilerplate to mm/vmstat.c
...
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com >
Acked-by: Christoph Lameter <cl@linux-foundation.org >
2008-10-23 17:35:04 +04:00
Alexey Dobriyan
b6aa44ab69
proc: move /proc/vmstat boilerplate to mm/vmstat.c
...
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com >
Acked-by: Christoph Lameter <cl@linux-foundation.org >
2008-10-23 17:12:51 +04:00
Alexey Dobriyan
74e2e8e8ce
proc: move /proc/pagetypeinfo boilerplate to mm/vmstat.c
...
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com >
2008-10-23 16:33:29 +04:00
Alexey Dobriyan
8f32f7e5ac
proc: move /proc/buddyinfo boilerplate to mm/vmstat.c
...
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com >
2008-10-23 16:12:04 +04:00
Alexey Dobriyan
5f6a6a9c4e
proc: move /proc/vmallocinfo to mm/vmalloc.c
...
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com >
Acked-by: Christoph Lameter <cl@linux-foundation.org >
2008-10-23 15:48:28 +04:00
Alexey Dobriyan
7b3c3a50a3
proc: move /proc/slabinfo boilerplate to mm/slub.c, mm/slab.c
...
Lose dummy ->write hook in case of SLUB, it's possible now.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com >
Acked-by: Pekka Enberg <penberg@cs.helsinki.fi >
2008-10-23 15:20:06 +04:00
Alexey Dobriyan
a0ec95a8e6
proc: move /proc/slab_allocators boilerplate to mm/slab.c
...
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com >
Acked-by: Pekka Enberg <penberg@cs.helsinki.fi >
2008-10-23 15:17:27 +04:00
Alexey Dobriyan
d6917e19f3
proc: move /proc/interrupts boilerplate code to fs/proc/interrupts.c
...
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com >
2008-10-23 15:15:46 +04:00
Alexey Dobriyan
df8106dbb5
proc: move /proc/stat to fs/proc/stat.c
...
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com >
2008-10-23 15:14:05 +04:00
Alexey Dobriyan
f500975a3f
proc: move rest of /proc/partitions code to block/genhd.c
...
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com >
Acked-by: Jens Axboe <jens.axboe@oracle.com >
2008-10-23 15:07:31 +04:00
Alexey Dobriyan
8591cf4322
proc: move /proc/cpuinfo code to fs/proc/cpuinfo.c
...
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com >
2008-10-23 15:05:11 +04:00
Alexey Dobriyan
fe2510426a
proc: move /proc/devices code to fs/proc/devices.c
...
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com >
2008-10-23 15:02:18 +04:00
Alexey Dobriyan
d8ba7a3633
proc: move rest of /proc/locks to fs/locks.c
...
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com >
2008-10-23 14:37:00 +04:00
Alexey Dobriyan
ae048112c0
proc: move /proc/kmsg creation to fs/proc/kmsg.c
...
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com >
2008-10-23 14:35:08 +04:00
Alexey Dobriyan
659689280a
proc: remove remnants of ->read_proc in proc_misc.c
...
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com >
2008-10-23 14:32:59 +04:00