diff options
author | Andrew Morton <akpm@osdl.org> | 2006-03-25 06:07:36 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 11:22:55 -0500 |
commit | c777ac5594f772ac760e02c3ac71d067616b579d (patch) | |
tree | 3a186fd7c1b63a89bc6c6749b2b234821ee8fdc4 /kernel/irq | |
parent | 4cae59d2e85c1ee2ab1ee284db1945c5394cd965 (diff) |
[PATCH] irq: uninline migration functions
Uninline some massive IRQ migration functions. Put them in the new
kernel/irq/migration.c.
Cc: Andi Kleen <ak@muc.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/irq')
-rw-r--r-- | kernel/irq/Makefile | 3 | ||||
-rw-r--r-- | kernel/irq/migration.c | 52 |
2 files changed, 53 insertions, 2 deletions
diff --git a/kernel/irq/Makefile b/kernel/irq/Makefile index 49378738ff5e..2b33f852be3e 100644 --- a/kernel/irq/Makefile +++ b/kernel/irq/Makefile | |||
@@ -1,5 +1,4 @@ | |||
1 | 1 | ||
2 | obj-y := handle.o manage.o spurious.o | 2 | obj-y := handle.o manage.o spurious.o migration.o |
3 | obj-$(CONFIG_GENERIC_IRQ_PROBE) += autoprobe.o | 3 | obj-$(CONFIG_GENERIC_IRQ_PROBE) += autoprobe.o |
4 | obj-$(CONFIG_PROC_FS) += proc.o | 4 | obj-$(CONFIG_PROC_FS) += proc.o |
5 | |||
diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c new file mode 100644 index 000000000000..6bdd03c524c7 --- /dev/null +++ b/kernel/irq/migration.c | |||
@@ -0,0 +1,52 @@ | |||
1 | #include <linux/irq.h> | ||
2 | |||
3 | #if defined(CONFIG_GENERIC_PENDING_IRQ) | ||
4 | |||
5 | void set_pending_irq(unsigned int irq, cpumask_t mask) | ||
6 | { | ||
7 | irq_desc_t *desc = irq_desc + irq; | ||
8 | unsigned long flags; | ||
9 | |||
10 | spin_lock_irqsave(&desc->lock, flags); | ||
11 | desc->move_irq = 1; | ||
12 | pending_irq_cpumask[irq] = mask; | ||
13 | spin_unlock_irqrestore(&desc->lock, flags); | ||
14 | } | ||
15 | |||
16 | void move_native_irq(int irq) | ||
17 | { | ||
18 | cpumask_t tmp; | ||
19 | irq_desc_t *desc = irq_descp(irq); | ||
20 | |||
21 | if (likely (!desc->move_irq)) | ||
22 | return; | ||
23 | |||
24 | desc->move_irq = 0; | ||
25 | |||
26 | if (likely(cpus_empty(pending_irq_cpumask[irq]))) | ||
27 | return; | ||
28 | |||
29 | if (!desc->handler->set_affinity) | ||
30 | return; | ||
31 | |||
32 | /* note - we hold the desc->lock */ | ||
33 | cpus_and(tmp, pending_irq_cpumask[irq], cpu_online_map); | ||
34 | |||
35 | /* | ||
36 | * If there was a valid mask to work with, please | ||
37 | * do the disable, re-program, enable sequence. | ||
38 | * This is *not* particularly important for level triggered | ||
39 | * but in a edge trigger case, we might be setting rte | ||
40 | * when an active trigger is comming in. This could | ||
41 | * cause some ioapics to mal-function. | ||
42 | * Being paranoid i guess! | ||
43 | */ | ||
44 | if (unlikely(!cpus_empty(tmp))) { | ||
45 | desc->handler->disable(irq); | ||
46 | desc->handler->set_affinity(irq,tmp); | ||
47 | desc->handler->enable(irq); | ||
48 | } | ||
49 | cpus_clear(pending_irq_cpumask[irq]); | ||
50 | } | ||
51 | |||
52 | #endif | ||