From: Andrew Morton <akpm@osdl.org>
To: tglx@linutronix.de
Cc: torvalds@osdl.org, linux-kernel@vger.kernel.org, mingo@elte.hu
Subject: Re: [PATCH] genirq:fixup missing SA_PERCPU replacement
Date: Sun, 2 Jul 2006 17:28:02 -0700 [thread overview]
Message-ID: <20060702172802.2b84a426.akpm@osdl.org> (raw)
In-Reply-To: <1151886032.24611.28.camel@localhost.localdomain>
On Mon, 03 Jul 2006 02:20:32 +0200
Thomas Gleixner <tglx@linutronix.de> wrote:
> The irqflags consolidation converted SA_PERCPU_IRQ to IRQF_PERCPU but
> did not define the new constant.
>
No, I fixed that up (you were cc'ed). Only I fixed it up the "old" way,
by putting it in include/asm-ia64/irq.h.
>
> Index: linux-2.6.git/include/linux/interrupt.h
> ===================================================================
> --- linux-2.6.git.orig/include/linux/interrupt.h 2006-07-02 23:38:32.000000000 +0200
> +++ linux-2.6.git/include/linux/interrupt.h 2006-07-03 01:57:20.000000000 +0200
> @@ -45,6 +45,7 @@
> #define IRQF_SHARED 0x00000080
> #define IRQF_PROBE_SHARED 0x00000100
> #define IRQF_TIMER 0x00000200
> +#define IRQF_PERCPU 0x00000400
>
> /*
> * Migration helpers. Scheduled for removal in 1/2007
> @@ -54,6 +55,7 @@
> #define SA_SAMPLE_RANDOM IRQF_SAMPLE_RANDOM
> #define SA_SHIRQ IRQF_SHARED
> #define SA_PROBEIRQ IRQF_PROBE_SHARED
> +#define SA_PERCPU IRQF_PERCPU
>
> #define SA_TRIGGER_LOW IRQF_TRIGGER_LOW
> #define SA_TRIGGER_HIGH IRQF_TRIGGER_HIGH
> Index: linux-2.6.git/kernel/irq/manage.c
> ===================================================================
> --- linux-2.6.git.orig/kernel/irq/manage.c 2006-07-02 23:38:32.000000000 +0200
> +++ linux-2.6.git/kernel/irq/manage.c 2006-07-03 01:58:45.000000000 +0200
> @@ -234,7 +234,7 @@ int setup_irq(unsigned int irq, struct i
> ((old->flags ^ new->flags) & IRQF_TRIGGER_MASK))
> goto mismatch;
>
> -#if defined(CONFIG_IRQ_PER_CPU) && defined(IRQF_PERCPU)
> +#if defined(CONFIG_IRQ_PER_CPU)
> /* All handlers must agree on per-cpuness */
> if ((old->flags & IRQF_PERCPU) !=
> (new->flags & IRQF_PERCPU))
> @@ -250,7 +250,7 @@ int setup_irq(unsigned int irq, struct i
> }
>
> *p = new;
> -#if defined(CONFIG_IRQ_PER_CPU) && defined(IRQF_PERCPU)
> +#if defined(CONFIG_IRQ_PER_CPU)
> if (new->flags & IRQF_PERCPU)
> desc->status |= IRQ_PER_CPU;
> #endif
This is of course better, but we'll also need:
--- a/include/asm-ia64/irq.h~a
+++ a/include/asm-ia64/irq.h
@@ -14,8 +14,6 @@
#define NR_IRQS 256
#define NR_IRQ_VECTORS NR_IRQS
-#define IRQF_PERCPU 0x02000000
-
static __inline__ int
irq_canonicalize (int irq)
{
_
prev parent reply other threads:[~2006-07-03 0:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-07-03 0:20 Thomas Gleixner
2006-07-03 0:28 ` Andrew Morton [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060702172802.2b84a426.akpm@osdl.org \
--to=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®