Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
Linus Torvalds [Fri, 18 Dec 2009 00:58:26 +0000 (16:58 -0800)]
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  Keys: KEYCTL_SESSION_TO_PARENT needs TIF_NOTIFY_RESUME architecture support
  NOMMU: Optimise away the {dac_,}mmap_min_addr tests
  security/min_addr.c: make init_mmap_min_addr() static
  keys: PTR_ERR return of wrong pointer in keyctl_get_security()

1  2 
kernel/sysctl.c

diff --combined kernel/sysctl.c
@@@ -1131,7 -1131,7 +1131,7 @@@ static struct ctl_table vm_table[] = 
                .data           = &sysctl_max_map_count,
                .maxlen         = sizeof(sysctl_max_map_count),
                .mode           = 0644,
 -              .proc_handler   = proc_dointvec,
 +              .proc_handler   = proc_dointvec_minmax,
                .extra1         = &zero,
        },
  #else
                .proc_handler   = proc_dointvec_jiffies,
        },
  #endif
+ #ifdef CONFIG_MMU
        {
                .procname       = "mmap_min_addr",
                .data           = &dac_mmap_min_addr,
                .mode           = 0644,
                .proc_handler   = mmap_min_addr_handler,
        },
+ #endif
  #ifdef CONFIG_NUMA
        {
                .procname       = "numa_zonelist_order",