lkml.org 
[lkml]   [2010]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH 59/97] NOMMU: Optimise away the {dac_,}mmap_min_addr tests
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@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2010-01-07 03:07    [from the cache]
©2003-2011 Jasper Spaans