2013-09-07 06:47:22

by Michael Opdenacker

Subject: [PATCH] x86/xen: remove deprecated IRQF_DISABLED

This patch proposes to remove the IRQF_DISABLED flag from x86/xen
code. It's a NOOP since 2.6.35 and it will be removed one day.

Signed-off-by: Michael Opdenacker <[email protected]>
---
arch/x86/xen/smp.c | 10 +++++-----
arch/x86/xen/spinlock.c | 2 +-
arch/x86/xen/time.c | 3 +--
3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index 9235842..71177a9 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -149,7 +149,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)
@@ -161,7 +161,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)
@@ -171,7 +171,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;
@@ -182,7 +182,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)
@@ -201,7 +201,7 @@ static int xen_smp_intr_init(unsigned int cpu)
rc = bind_ipi_to_irqhandler(XEN_IRQ_WORK_VECTOR,
cpu,
xen_irq_work_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 0438b93..d1a3064 100644
--- a/arch/x86/xen/spinlock.c
+++ b/arch/x86/xen/spinlock.c
@@ -255,7 +255,7 @@ void 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 ee36589..12a1ca7 100644
--- a/arch/x86/xen/time.c
+++ b/arch/x86/xen/time.c
@@ -443,8 +443,7 @@ 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_PERCPU|IRQF_NOBALANCING|IRQF_TIMER|
IRQF_FORCE_RESUME,
name, NULL);

--
1.8.1.2

2013-09-08 15:14:47

by Boris Ostrovsky

Subject: Re: [PATCH] x86/xen: remove deprecated IRQF_DISABLED

----- [email protected] wrote:

> This patch proposes to remove the IRQF_DISABLED flag from x86/xen
> code. It's a NOOP since 2.6.35 and it will be removed one day.
>
> Signed-off-by: Michael Opdenacker
> <[email protected]>
> ---
> arch/x86/xen/smp.c | 10 +++++-----
> arch/x86/xen/spinlock.c | 2 +-
> arch/x86/xen/time.c | 3 +--
> 3 files changed, 7 insertions(+), 8 deletions(-)


If you are cleaning up Xen's use of IRQF_DISABLED then you should
probably also update drivers/xen/evtchn.c and drivers/xen/platform-pci.c

-boris

2013-09-09 03:15:56

by Michael Opdenacker

Subject: Re: [PATCH] x86/xen: remove deprecated IRQF_DISABLED

Hi Boris,

Thanks for your review!

On 09/08/2013 05:14 PM, Boris Ostrovsky wrote:
> ----- [email protected] wrote:
>
>> This patch proposes to remove the IRQF_DISABLED flag from x86/xen
>> code. It's a NOOP since 2.6.35 and it will be removed one day.
>>
>> Signed-off-by: Michael Opdenacker
>> <[email protected]>
>> ---
>> arch/x86/xen/smp.c | 10 +++++-----
>> arch/x86/xen/spinlock.c | 2 +-
>> arch/x86/xen/time.c | 3 +--
>> 3 files changed, 7 insertions(+), 8 deletions(-)
>
> If you are cleaning up Xen's use of IRQF_DISABLED then you should
> probably also update drivers/xen/evtchn.c and drivers/xen/platform-pci.c
This definitely makes sense to do this at the same time. I've just
submitted a separate patch for this.

Thanks again,

Michael.

--
Michael Opdenacker, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
+33 484 258 098