lkml.org 
[lkml]   [2009]   [Dec]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] HWPOISON: Add PROC_FS dependency to hwpoison injector v2
    Hi Linus,

    This fixes a obscure build problem with the hwpoison injector
    code, found by Ingo's tip compilation testing. The injector requires
    PROC_FS and doesn't build when it is disabled. Add suitable
    dependencies and ifdefs. Please apply.
    Thanks,
    -Andi

    ---

    HWPOISON: Add PROC_FS dependency to hwpoison injector v2

    The injector filter requires stable_page_flags() which is supplied
    by procfs. So make it dependent on that.

    Also add ifdefs around the filter code in memory-failure.c so that
    when the filter is disabled due to missing dependencies the whole
    code still builds.

    Reported-by: Ingo Molnar
    Signed-off-by: Andi Kleen <ak@linux.intel.com>

    ---
    mm/Kconfig | 2 +-
    mm/memory-failure.c | 9 +++++++++
    2 files changed, 10 insertions(+), 1 deletion(-)

    Index: linux/mm/Kconfig
    ===================================================================
    --- linux.orig/mm/Kconfig
    +++ linux/mm/Kconfig
    @@ -252,7 +252,7 @@ config MEMORY_FAILURE

    config HWPOISON_INJECT
    tristate "HWPoison pages injector"
    - depends on MEMORY_FAILURE && DEBUG_KERNEL
    + depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
    select PROC_PAGE_MONITOR

    config NOMMU_INITIAL_TRIM_EXCESS
    Index: linux/mm/memory-failure.c
    ===================================================================
    --- linux.orig/mm/memory-failure.c
    +++ linux/mm/memory-failure.c
    @@ -52,6 +52,8 @@ int sysctl_memory_failure_recovery __rea

    atomic_long_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);

    +#if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
    +
    u32 hwpoison_filter_enable = 0;
    u32 hwpoison_filter_dev_major = ~0U;
    u32 hwpoison_filter_dev_minor = ~0U;
    @@ -164,6 +166,13 @@ int hwpoison_filter(struct page *p)

    return 0;
    }
    +#else
    +int hwpoison_filter(struct page *p)
    +{
    + return 0;
    +}
    +#endif
    +
    EXPORT_SYMBOL_GPL(hwpoison_filter);

    /*

    \
     
     \ /
      Last update: 2009-12-19 11:51    [W:0.020 / U:61.436 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site