[PATCH] unmodified-drivers: tolerate IRQF_DISABLED being undefined

[PATCH] unmodified-drivers: tolerate IRQF_DISABLED being undefined

[Jan Beulich]

It's being removed in Linux 4.1.

Signed-off-by: Jan Beulich <jbeulich@suse.com>

--- a/unmodified_drivers/linux-2.6/platform-pci/evtchn.c
+++ b/unmodified_drivers/linux-2.6/platform-pci/evtchn.c
@@ -350,11 +350,13 @@ int xen_irq_init(struct pci_dev *pdev)
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
 			   SA_SHIRQ | SA_SAMPLE_RANDOM | SA_INTERRUPT,
 #else
-			   IRQF_SHARED |
 #ifdef IRQF_SAMPLE_RANDOM
 			   IRQF_SAMPLE_RANDOM |
 #endif
-			   IRQF_DISABLED,
+#ifdef IRQF_DISABLED
+			   IRQF_DISABLED |
+#endif
+			   IRQF_SHARED,
 #endif
 			   "xen-platform-pci", pdev);
 }

Re: [PATCH] unmodified-drivers: tolerate IRQF_DISABLED being undefined

[Ian Campbell]

On Mon, 2015-06-01 at 14:50 +0100, Jan Beulich wrote:
> It's being removed in Linux 4.1.
> 
> Signed-off-by: Jan Beulich <jbeulich@suse.com>

Not sure who should, but:

Acked-by: Ian Campbell <ian.campbell@citrix.com>

Re: [PATCH] unmodified-drivers: tolerate IRQF_DISABLED being undefined

[Jan Beulich]

>>> On 01.06.15 at 15:56, <ian.campbell@citrix.com> wrote:
> On Mon, 2015-06-01 at 14:50 +0100, Jan Beulich wrote:
>> It's being removed in Linux 4.1.
>> 
>> Signed-off-by: Jan Beulich <jbeulich@suse.com>
> 
> Not sure who should, but:

I guess no-one really needs to for that old code. But thanks!

Jan

Re: [PATCH] unmodified-drivers: tolerate IRQF_DISABLED being undefined

[Olaf Hering]

On Mon, Jun 01, Jan Beulich wrote:

> >>> On 01.06.15 at 15:56, <ian.campbell@citrix.com> wrote:
> > On Mon, 2015-06-01 at 14:50 +0100, Jan Beulich wrote:
> >> It's being removed in Linux 4.1.
> >> 
> >> Signed-off-by: Jan Beulich <jbeulich@suse.com>
> > 
> > Not sure who should, but:
> 
> I guess no-one really needs to for that old code. But thanks!

Any chance to backport this to all 4.x branches?

Olaf

Re: [PATCH] unmodified-drivers: tolerate IRQF_DISABLED being undefined

[Jan Beulich]

>>> On 21.07.15 at 08:52, <olaf@aepfle.de> wrote:
> On Mon, Jun 01, Jan Beulich wrote:
> 
>> >>> On 01.06.15 at 15:56, <ian.campbell@citrix.com> wrote:
>> > On Mon, 2015-06-01 at 14:50 +0100, Jan Beulich wrote:
>> >> It's being removed in Linux 4.1.
>> >> 
>> >> Signed-off-by: Jan Beulich <jbeulich@suse.com>
>> > 
>> > Not sure who should, but:
>> 
>> I guess no-one really needs to for that old code. But thanks!
> 
> Any chance to backport this to all 4.x branches?

Taking it to mean "all maintained", that's possible, but since I can't
immediately see the point I'd like to ask for some justification. Us -
SUSE - apparently being the only consumer of that code, and us
not using Xen 4.4 together with Linux 4.1, and our 4.5 trees
already having the backport, I'm having some difficulty
understanding the reason for the request.

Thanks, Jan

Re: [PATCH] unmodified-drivers: tolerate IRQF_DISABLED being undefined

[Olaf Hering]

On Tue, Jul 21, Jan Beulich wrote:

> Taking it to mean "all maintained", that's possible, but since I can't
> immediately see the point I'd like to ask for some justification. Us -
> SUSE - apparently being the only consumer of that code, and us
> not using Xen 4.4 together with Linux 4.1, and our 4.5 trees
> already having the backport, I'm having some difficulty
> understanding the reason for the request.

I run compile tests of all xen-4.x branches against all SUSE releases to
spot new errors. But since all the required changes for gcc wont be
backported anyway I will just patch also this issues out of my copy.

Olaf