lkml.org 
[lkml]   [2008]   [Aug]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/15] x86: apic - unify apic_set_verbosity
    Date
    Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
    ---
    arch/x86/kernel/apic_32.c | 17 +++++++++++++--
    arch/x86/kernel/apic_64.c | 46 ++++++++++++++++++++++++--------------------
    2 files changed, 39 insertions(+), 24 deletions(-)

    diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
    index af227bc..acbc4de 100644
    --- a/arch/x86/kernel/apic_32.c
    +++ b/arch/x86/kernel/apic_32.c
    @@ -1768,13 +1768,24 @@ early_param("lapic_timer_c2_ok", parse_lapic_timer_c2_ok);

    static int __init apic_set_verbosity(char *arg)
    {
    - if (!arg)
    + if (!arg) {
    +#ifdef CONFIG_X86_64
    + skip_ioapic_setup = 0;
    + ioapic_force = 1;
    + return 0;
    +#endif
    return -EINVAL;
    + }

    - if (strcmp(arg, "debug") == 0)
    + if (strcmp("debug", arg) == 0)
    apic_verbosity = APIC_DEBUG;
    - else if (strcmp(arg, "verbose") == 0)
    + else if (strcmp("verbose", arg) == 0)
    apic_verbosity = APIC_VERBOSE;
    + else {
    + printk(KERN_WARNING "APIC Verbosity level %s not recognised"
    + " use apic=verbose or apic=debug\n", arg);
    + return -EINVAL;
    + }

    return 0;
    }
    diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
    index a9ad2cb..9997818 100644
    --- a/arch/x86/kernel/apic_64.c
    +++ b/arch/x86/kernel/apic_64.c
    @@ -1759,27 +1759,6 @@ early_param("nox2apic", setup_nox2apic);
    /*
    * APIC command line parameters
    */
    -static int __init apic_set_verbosity(char *str)
    -{
    - if (str == NULL) {
    - skip_ioapic_setup = 0;
    - ioapic_force = 1;
    - return 0;
    - }
    - if (strcmp("debug", str) == 0)
    - apic_verbosity = APIC_DEBUG;
    - else if (strcmp("verbose", str) == 0)
    - apic_verbosity = APIC_VERBOSE;
    - else {
    - printk(KERN_WARNING "APIC Verbosity level %s not recognised"
    - " use apic=verbose or apic=debug\n", str);
    - return -EINVAL;
    - }
    -
    - return 0;
    -}
    -early_param("apic", apic_set_verbosity);
    -
    static __init int setup_disableapic(char *str)
    {
    disable_apic = 1;
    @@ -1824,6 +1803,31 @@ static __init int setup_apicpmtimer(char *s)
    }
    __setup("apicpmtimer", setup_apicpmtimer);

    +static int __init apic_set_verbosity(char *arg)
    +{
    + if (!arg) {
    +#ifdef CONFIG_X86_64
    + skip_ioapic_setup = 0;
    + ioapic_force = 1;
    + return 0;
    +#endif
    + return -EINVAL;
    + }
    +
    + if (strcmp("debug", arg) == 0)
    + apic_verbosity = APIC_DEBUG;
    + else if (strcmp("verbose", arg) == 0)
    + apic_verbosity = APIC_VERBOSE;
    + else {
    + printk(KERN_WARNING "APIC Verbosity level %s not recognised"
    + " use apic=verbose or apic=debug\n", arg);
    + return -EINVAL;
    + }
    +
    + return 0;
    +}
    +early_param("apic", apic_set_verbosity);
    +
    static int __init lapic_insert_resource(void)
    {
    if (!apic_phys)
    --
    1.6.0.rc1.34.g0fe8c


    \
     
     \ /
      Last update: 2008-08-18 18:51    [W:2.486 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site