lkml.org 
[lkml]   [2011]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[34-longterm 173/247] x86: Emit "mem=nopentium ignored" warning when not supported
    Date
    From: Kamal Mostafa <kamal@canonical.com>

    -------------------
    This is a commit scheduled for the next v2.6.34 longterm release.
    If you see a problem with using this for longterm, please comment.
    -------------------

    commit 9a6d44b9adb777ca9549e88cd55bd8f2673c52a2 upstream.

    Emit warning when "mem=nopentium" is specified on any arch other
    than x86_32 (the only that arch supports it).

    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    BugLink: http://bugs.launchpad.net/bugs/553464
    Cc: Yinghai Lu <yinghai@kernel.org>
    Cc: Len Brown <len.brown@intel.com>
    Cc: Rafael J. Wysocki <rjw@sisk.pl>
    LKML-Reference: <1296783486-23033-2-git-send-email-kamal@canonical.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    arch/x86/kernel/e820.c | 7 +++++--
    1 files changed, 5 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
    index 4267f42..41ac10e 100644
    --- a/arch/x86/kernel/e820.c
    +++ b/arch/x86/kernel/e820.c
    @@ -980,12 +980,15 @@ static int __init parse_memopt(char *p)
    if (!p)
    return -EINVAL;

    -#ifdef CONFIG_X86_32
    if (!strcmp(p, "nopentium")) {
    +#ifdef CONFIG_X86_32
    setup_clear_cpu_cap(X86_FEATURE_PSE);
    return 0;
    - }
    +#else
    + printk(KERN_WARNING "mem=nopentium ignored! (only supported on x86_32)\n");
    + return -EINVAL;
    #endif
    + }

    userdef = 1;
    mem_size = memparse(p, &p);
    --
    1.7.4.4


    \
     
     \ /
      Last update: 2011-06-23 20:01    [W:7.745 / U:0.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site