lkml.org 
[lkml]   [2011]   [Mar]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[05/78] x86: Emit "mem=nopentium ignored" warning when not supported
    2.6.38-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Kamal Mostafa <kamal@canonical.com>

    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: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    arch/x86/kernel/e820.c | 7 +++++--
    1 file changed, 5 insertions(+), 2 deletions(-)

    --- a/arch/x86/kernel/e820.c
    +++ b/arch/x86/kernel/e820.c
    @@ -847,12 +847,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);



    \
     
     \ /
      Last update: 2011-03-22 00:37    [W:0.025 / U:270.692 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site