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:
  proc: remove kernel.maps_protect
  proc: remove now unneeded ADDBUF macro
  [PATCH] proc: show personality via /proc/pid/personality
  [PATCH] signal, procfs: some lock_task_sighand() users do not need rcu_read_lock()
  proc: move PROC_PAGE_MONITOR to fs/proc/Kconfig
  proc: make grab_header() static
  proc: remove unused get_dma_list()
  proc: remove dummy vmcore_open()
  proc: proc_sys_root tweak
  proc: fix return value of proc_reg_open() in "too late" case

Fixed up trivial conflict in removed file arch/sparc/include/asm/dma_32.h

diff --combined Documentation/filesystems/proc.txt
index d831d24d2a6c133214ad3663f1d7762138e3dbe4,63ed861d5ca17d90165e9e48c42ace3c81943bdd..b488edad743cef9c5d8fea84ab1dcb491aa38c87
--- 1/Documentation/filesystems/proc.txt
--- 2/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@@ -923,44 -923,45 +923,44 @@@ CPUs
  The   "procs_blocked" line gives  the  number of  processes currently blocked,
  waiting for I/O to complete.
  
 +
  1.9 Ext4 file system parameters
  ------------------------------
 -Ext4 file system have one directory per partition under /proc/fs/ext4/
 -# ls /proc/fs/ext4/hdc/
 -group_prealloc  max_to_scan  mb_groups  mb_history  min_to_scan  order2_req
 -stats  stream_req
 -
 -mb_groups:
 -This file gives the details of multiblock allocator buddy cache of free blocks
 -
 -mb_history:
 -Multiblock allocation history.
 -
 -stats:
 -This file indicate whether the multiblock allocator should start collecting
 -statistics. The statistics are shown during unmount
 -
 -group_prealloc:
 -The multiblock allocator normalize the block allocation request to
 -group_prealloc filesystem blocks if we don't have strip value set.
 -The stripe value can be specified at mount time or during mke2fs.
 -
 -max_to_scan:
 -How long multiblock allocator can look for a best extent (in found extents)
 -
 -min_to_scan:
 -How long multiblock allocator  must look for a best extent
 -
 -order2_req:
 -Multiblock allocator use  2^N search using buddies only for requests greater
 -than or equal to order2_req. The request size is specfied in file system
 -blocks. A value of 2 indicate only if the requests are greater than or equal
 -to 4 blocks.
 -
 -stream_req:
 -Files smaller than stream_req are served by the stream allocator, whose
 -purpose is to pack requests as close each to other as possible to
 -produce smooth I/O traffic. Avalue of 16 indicate that file smaller than 16
 -filesystem block size will use group based preallocation.
 +
 +Information about mounted ext4 file systems can be found in
 +/proc/fs/ext4.  Each mounted filesystem will have a directory in
 +/proc/fs/ext4 based on its device name (i.e., /proc/fs/ext4/hdc or
 +/proc/fs/ext4/dm-0).   The files in each per-device directory are shown
 +in Table 1-10, below.
 +
 +Table 1-10: Files in /proc/fs/ext4/<devname>
 +..............................................................................
 + File            Content                                        
 + mb_groups       details of multiblock allocator buddy cache of free blocks
 + mb_history      multiblock allocation history
 + stats           controls whether the multiblock allocator should start
 +                 collecting statistics, which are shown during the unmount
 + group_prealloc  the multiblock allocator will round up allocation
 +                 requests to a multiple of this tuning parameter if the
 +                 stripe size is not set in the ext4 superblock
 + max_to_scan     The maximum number of extents the multiblock allocator
 +                 will search to find the best extent
 + min_to_scan     The minimum number of extents the multiblock allocator
 +                 will search to find the best extent
 + order2_req      Tuning parameter which controls the minimum size for 
 +                 requests (as a power of 2) where the buddy cache is
 +                 used
 + stream_req      Files which have fewer blocks than this tunable
 +                 parameter will have their blocks allocated out of a
 +                 block group specific preallocation pool, so that small
 +                 files are packed closely together.  Each large file
 +                 will have its blocks allocated out of its own unique
 +                 preallocation pool.
 +inode_readahead  Tuning parameter which controls the maximum number of
 +                 inode table blocks that ext4's inode table readahead
 +                 algorithm will pre-read into the buffer cache
 +..............................................................................
 +
  
  ------------------------------------------------------------------------------
  Summary
@@@ -1331,13 -1332,6 +1331,6 @@@ determine whether or not they are stil
  Because the NMI watchdog shares registers with oprofile, by disabling the NMI
  watchdog, oprofile may have more registers to utilize.
  
- maps_protect
- ------------
- 
- Enables/Disables the protection of the per-process proc entries "maps" and
- "smaps".  When enabled, the contents of these files are visible only to
- readers that are allowed to ptrace() the given process.
- 
  msgmni
  ------
  

diff --combined kernel/sysctl.c
index 1bf369bd44234e829905d9a565577537c040c846,cc3e0d7a5acf97c5854f01b0fc166ea245795517..c468c3c6dfc525e0c413eae9f90a8b77d77887f0
--- 1/kernel/sysctl.c
--- 2/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@@ -80,7 -80,6 +80,6 @@@ extern int pid_max_min, pid_max_max
  extern int sysctl_drop_caches;
  extern int percpu_pagelist_fraction;
  extern int compat_log;
- extern int maps_protect;
  extern int latencytop_enabled;
  extern int sysctl_nr_open_min, sysctl_nr_open_max;
  #ifdef CONFIG_RCU_TORTURE_TEST
@@@ -118,8 -117,10 +117,8 @@@ extern char modprobe_path[]
  extern int sg_big_buff;
  #endif
  
 -#ifdef __sparc__
 -extern char reboot_command [];
 -extern int stop_a_enabled;
 -extern int scons_pwroff;
 +#ifdef CONFIG_SPARC
 +#include <asm/system.h>
  #endif
  
  #ifdef __hppa__
@@@ -413,7 -414,7 +412,7 @@@ static struct ctl_table kern_table[] = 
                .mode           = 0644,
                .proc_handler   = &proc_dointvec,
        },
 -#ifdef __sparc__
 +#ifdef CONFIG_SPARC
        {
                .ctl_name       = KERN_SPARC_REBOOT,
                .procname       = "reboot-cmd",
@@@ -807,16 -808,6 +806,6 @@@
                .mode           = 0644,
                .proc_handler   = &proc_dointvec,
        },
- #endif
- #ifdef CONFIG_PROC_FS
-       {
-               .ctl_name       = CTL_UNNUMBERED,
-               .procname       = "maps_protect",
-               .data           = &maps_protect,
-               .maxlen         = sizeof(int),
-               .mode           = 0644,
-               .proc_handler   = &proc_dointvec,
-       },
  #endif
        {
                .ctl_name       = CTL_UNNUMBERED,