lkml.org 
[lkml]   [2011]   [Oct]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/1] x86: removed deprecated IRQF_DISABLED
    Date
    Signed-off-by: Nasir Abed <nasirabed+kernel@gmail.com>
    ---
    arch/x86/include/asm/floppy.h | 4 ++--
    arch/x86/kernel/hpet.c | 2 +-
    arch/x86/kernel/time.c | 2 +-
    arch/x86/xen/smp.c | 8 ++++----
    arch/x86/xen/spinlock.c | 2 +-
    arch/x86/xen/time.c | 5 ++---
    6 files changed, 11 insertions(+), 12 deletions(-)

    diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
    index dbe82a5..22bf4d6 100644
    --- a/arch/x86/include/asm/floppy.h
    +++ b/arch/x86/include/asm/floppy.h
    @@ -145,10 +145,10 @@ static int fd_request_irq(void)
    {
    if (can_use_virtual_dma)
    return request_irq(FLOPPY_IRQ, floppy_hardint,
    - IRQF_DISABLED, "floppy", NULL);
    + 0, "floppy", NULL);
    else
    return request_irq(FLOPPY_IRQ, floppy_interrupt,
    - IRQF_DISABLED, "floppy", NULL);
    + 0, "floppy", NULL);
    }

    static unsigned long dma_mem_alloc(unsigned long size)
    diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
    index 4aecc54..9d96096 100644
    --- a/arch/x86/kernel/hpet.c
    +++ b/arch/x86/kernel/hpet.c
    @@ -515,7 +515,7 @@ static int hpet_setup_irq(struct hpet_dev *dev)
    {

    if (request_irq(dev->irq, hpet_interrupt_handler,
    - IRQF_TIMER | IRQF_DISABLED | IRQF_NOBALANCING,
    + IRQF_TIMER | IRQF_NOBALANCING,
    dev->name, dev))
    return -1;

    diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
    index 5a64d05..e62386a 100644
    --- a/arch/x86/kernel/time.c
    +++ b/arch/x86/kernel/time.c
    @@ -70,7 +70,7 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id)

    static struct irqaction irq0 = {
    .handler = timer_interrupt,
    - .flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_IRQPOLL | IRQF_TIMER,
    + .flags = IRQF_NOBALANCING | IRQF_IRQPOLL | IRQF_TIMER,
    .name = "timer"
    };

    diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
    index 041d4fe..a375a75 100644
    --- a/arch/x86/xen/smp.c
    +++ b/arch/x86/xen/smp.c
    @@ -100,7 +100,7 @@ static int xen_smp_intr_init(unsigned int cpu)
    rc = bind_ipi_to_irqhandler(XEN_RESCHEDULE_VECTOR,
    cpu,
    xen_reschedule_interrupt,
    - IRQF_DISABLED|IRQF_PERCPU|IRQF_NOBALANCING,
    + IRQF_PERCPU|IRQF_NOBALANCING,
    resched_name,
    NULL);
    if (rc < 0)
    @@ -111,7 +111,7 @@ static int xen_smp_intr_init(unsigned int cpu)
    rc = bind_ipi_to_irqhandler(XEN_CALL_FUNCTION_VECTOR,
    cpu,
    xen_call_function_interrupt,
    - IRQF_DISABLED|IRQF_PERCPU|IRQF_NOBALANCING,
    + IRQF_PERCPU|IRQF_NOBALANCING,
    callfunc_name,
    NULL);
    if (rc < 0)
    @@ -120,7 +120,7 @@ static int xen_smp_intr_init(unsigned int cpu)

    debug_name = kasprintf(GFP_KERNEL, "debug%d", cpu);
    rc = bind_virq_to_irqhandler(VIRQ_DEBUG, cpu, xen_debug_interrupt,
    - IRQF_DISABLED | IRQF_PERCPU | IRQF_NOBALANCING,
    + IRQF_PERCPU | IRQF_NOBALANCING,
    debug_name, NULL);
    if (rc < 0)
    goto fail;
    @@ -130,7 +130,7 @@ static int xen_smp_intr_init(unsigned int cpu)
    rc = bind_ipi_to_irqhandler(XEN_CALL_FUNCTION_SINGLE_VECTOR,
    cpu,
    xen_call_function_single_interrupt,
    - IRQF_DISABLED|IRQF_PERCPU|IRQF_NOBALANCING,
    + IRQF_PERCPU|IRQF_NOBALANCING,
    callfunc_name,
    NULL);
    if (rc < 0)
    diff --git a/arch/x86/xen/spinlock.c b/arch/x86/xen/spinlock.c
    index cc9b1e1..27882f5 100644
    --- a/arch/x86/xen/spinlock.c
    +++ b/arch/x86/xen/spinlock.c
    @@ -354,7 +354,7 @@ void __cpuinit xen_init_lock_cpu(int cpu)
    irq = bind_ipi_to_irqhandler(XEN_SPIN_UNLOCK_VECTOR,
    cpu,
    dummy_handler,
    - IRQF_DISABLED|IRQF_PERCPU|IRQF_NOBALANCING,
    + IRQF_PERCPU|IRQF_NOBALANCING,
    name,
    NULL);

    diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c
    index 163b467..1889b8e 100644
    --- a/arch/x86/xen/time.c
    +++ b/arch/x86/xen/time.c
    @@ -394,9 +394,8 @@ void xen_setup_timer(int cpu)
    name = "<timer kasprintf failed>";

    irq = bind_virq_to_irqhandler(VIRQ_TIMER, cpu, xen_timer_interrupt,
    - IRQF_DISABLED|IRQF_PERCPU|
    - IRQF_NOBALANCING|IRQF_TIMER|
    - IRQF_FORCE_RESUME,
    + IRQF_PERCPU|IRQF_NOBALANCING|
    + IRQF_TIMER|IRQF_FORCE_RESUME,
    name, NULL);

    evt = &per_cpu(xen_clock_events, cpu);
    --
    1.7.4.1


    \
     
     \ /
      Last update: 2011-10-07 19:29    [W:0.025 / U:121.164 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site