2013-09-09 03:09:53

by Michael Opdenacker

[permalink] [raw]
Subject: [PATCH] xen: remove deprecated IRQF_DISABLED

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

Note that architecture dependent fixes for IRQF_DISABLED
were already submitted through separate patches.

Signed-off-by: Michael Opdenacker <[email protected]>
---
drivers/xen/evtchn.c | 2 +-
drivers/xen/platform-pci.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c
index 8b3a69a..5de2063 100644
--- a/drivers/xen/evtchn.c
+++ b/drivers/xen/evtchn.c
@@ -305,7 +305,7 @@ static int evtchn_bind_to_user(struct per_user_data *u, int port)
if (rc < 0)
goto err;

- rc = bind_evtchn_to_irqhandler(port, evtchn_interrupt, IRQF_DISABLED,
+ rc = bind_evtchn_to_irqhandler(port, evtchn_interrupt, 0,
u->name, evtchn);
if (rc < 0)
goto err;
diff --git a/drivers/xen/platform-pci.c b/drivers/xen/platform-pci.c
index 99db9e1..2f3528e 100644
--- a/drivers/xen/platform-pci.c
+++ b/drivers/xen/platform-pci.c
@@ -84,7 +84,7 @@ static irqreturn_t do_hvm_evtchn_intr(int irq, void *dev_id)
static int xen_allocate_irq(struct pci_dev *pdev)
{
return request_irq(pdev->irq, do_hvm_evtchn_intr,
- IRQF_DISABLED | IRQF_NOBALANCING | IRQF_TRIGGER_RISING,
+ IRQF_NOBALANCING | IRQF_TRIGGER_RISING,
"xen-platform-pci", pdev);
}

--
1.8.1.2


2013-09-09 03:23:26

by Ramkumar Ramachandra

[permalink] [raw]
Subject: Re: [PATCH] xen: remove deprecated IRQF_DISABLED

Michael Opdenacker wrote:
> diff --git a/drivers/xen/platform-pci.c b/drivers/xen/platform-pci.c
> index 99db9e1..2f3528e 100644
> --- a/drivers/xen/platform-pci.c
> +++ b/drivers/xen/platform-pci.c
> @@ -84,7 +84,7 @@ static irqreturn_t do_hvm_evtchn_intr(int irq, void *dev_id)
> static int xen_allocate_irq(struct pci_dev *pdev)
> {
> return request_irq(pdev->irq, do_hvm_evtchn_intr,
> - IRQF_DISABLED | IRQF_NOBALANCING | IRQF_TRIGGER_RISING,
> + IRQF_NOBALANCING | IRQF_TRIGGER_RISING,

This is a good patch, although that one day might be far in the future.

2013-09-09 03:52:38

by Michael Opdenacker

[permalink] [raw]
Subject: Re: [PATCH] xen: remove deprecated IRQF_DISABLED

On 09/09/2013 05:22 AM, Ramkumar Ramachandra wrote:
> Michael Opdenacker wrote:
>> diff --git a/drivers/xen/platform-pci.c b/drivers/xen/platform-pci.c
>> index 99db9e1..2f3528e 100644
>> --- a/drivers/xen/platform-pci.c
>> +++ b/drivers/xen/platform-pci.c
>> @@ -84,7 +84,7 @@ static irqreturn_t do_hvm_evtchn_intr(int irq, void *dev_id)
>> static int xen_allocate_irq(struct pci_dev *pdev)
>> {
>> return request_irq(pdev->irq, do_hvm_evtchn_intr,
>> - IRQF_DISABLED | IRQF_NOBALANCING | IRQF_TRIGGER_RISING,
>> + IRQF_NOBALANCING | IRQF_TRIGGER_RISING,
> This is a good patch, although that one day might be far in the future.
Yes, it might be relatively far... IRQF_DISABLED still shows up 331
times in the kernel sources.

It's hard to disable ;)

Cheers,

Michael.

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