Re: [PATCH 59/97] NOMMU: Optimise away the {dac_,}mmap_min_addr tests

[Mike Frysinger]

On Mon, Jan 4, 2010 at 19:33, Greg Kroah-Hartman wrote:
> --- a/kernel/sysctl.c
> +++ b/kernel/sysctl.c
> @@ -1200,6 +1200,7 @@ static struct ctl_table vm_table[] = {
> Â Â Â Â Â Â Â Â.extra2 Â Â Â Â = (void *)&hugetlb_infinity,
> Â Â Â Â},
> Â#endif
> +#ifdef CONFIG_MMU
> Â Â Â Â{
>        Â.ctl_name    = VM_LOWMEM_RESERVE_RATIO,
>        Â.procname    = "lowmem_reserve_ratio",
> @@ -1353,6 +1354,7 @@ static struct ctl_table vm_table[] = {
>        Â.mode      = 0644,
>        Â.proc_handler  = &mmap_min_addr_handler,
> Â Â Â Â},
> +#endif
> Â#ifdef CONFIG_NUMA
> Â Â Â Â{
>        Â.ctl_name    = CTL_UNNUMBERED,

seems there was a merge error here when adding the patch to the stable
branch.  this change disables a large number of things when it should
only be disabling mmap_min_addr.  notice how the first #ifdef appears
at line ~1200 while the second appears at line ~1353.  the original
commit was ~1214 to ~1221.
-mike
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/