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 ...
Showing
- arch/m68k/amiga/config.c 9 additions, 12 deletionsarch/m68k/amiga/config.c
- arch/m68k/atari/config.c 7 additions, 8 deletionsarch/m68k/atari/config.c
- arch/m68k/atari/stram.c 22 additions, 6 deletionsarch/m68k/atari/stram.c
- arch/m68k/bvme6000/config.c 0 additions, 11 deletionsarch/m68k/bvme6000/config.c
- arch/m68k/kernel/setup.c 28 additions, 7 deletionsarch/m68k/kernel/setup.c
- arch/m68k/mvme147/config.c 0 additions, 10 deletionsarch/m68k/mvme147/config.c
- arch/m68k/mvme16x/config.c 5 additions, 10 deletionsarch/m68k/mvme16x/config.c
- arch/m68k/q40/config.c 0 additions, 10 deletionsarch/m68k/q40/config.c
- arch/m68k/sun3/config.c 3 additions, 9 deletionsarch/m68k/sun3/config.c
- arch/m68k/sun3x/config.c 3 additions, 9 deletionsarch/m68k/sun3x/config.c
- arch/x86/include/asm/pgtable.h 2 additions, 1 deletionarch/x86/include/asm/pgtable.h
- arch/x86/mm/pageattr.c 5 additions, 6 deletionsarch/x86/mm/pageattr.c
- block/genhd.c 35 additions, 2 deletionsblock/genhd.c
- fs/filesystems.c 39 additions, 0 deletionsfs/filesystems.c
- fs/locks.c 21 additions, 1 deletionfs/locks.c
- fs/proc/Makefile 11 additions, 2 deletionsfs/proc/Makefile
- fs/proc/cmdline.c 29 additions, 0 deletionsfs/proc/cmdline.c
- fs/proc/cpuinfo.c 24 additions, 0 deletionsfs/proc/cpuinfo.c
- fs/proc/devices.c 70 additions, 0 deletionsfs/proc/devices.c
- fs/proc/generic.c 1 addition, 2 deletionsfs/proc/generic.c
Loading
Please register or sign in to comment