From 35a263326225b2b9f43a9faec9f7fa445a637c61 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Tue, 29 Mar 2011 02:51:13 +0200 Subject: [PATCH] --- yaml --- r: 243373 b: refs/heads/master c: 851d7cf647e0d31668eb5dc496f7698a2f6136b4 h: refs/heads/master i: 243371: 7801842e8d7cc7779cf20ba2be3e9b6c6581d4b9 v: v3 --- [refs] | 2 +- trunk/include/linux/irq.h | 4 ---- trunk/kernel/irq/migration.c | 10 ---------- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 26b1fe0024c1..a885d226de95 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c6f8a8b917ad361319c8ace3e9f28e69bfdb4c1 +refs/heads/master: 851d7cf647e0d31668eb5dc496f7698a2f6136b4 diff --git a/trunk/include/linux/irq.h b/trunk/include/linux/irq.h index 7b3faace437d..2a375a72ce3c 100644 --- a/trunk/include/linux/irq.h +++ b/trunk/include/linux/irq.h @@ -386,13 +386,9 @@ extern int __irq_set_affinity_locked(struct irq_data *data, const struct cpumas #ifdef CONFIG_GENERIC_HARDIRQS #if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_PENDING_IRQ) -void move_native_irq(int irq); -void move_masked_irq(int irq); void irq_move_irq(struct irq_data *data); void irq_move_masked_irq(struct irq_data *data); #else -static inline void move_native_irq(int irq) { } -static inline void move_masked_irq(int irq) { } static inline void irq_move_irq(struct irq_data *data) { } static inline void irq_move_masked_irq(struct irq_data *data) { } #endif diff --git a/trunk/kernel/irq/migration.c b/trunk/kernel/irq/migration.c index e33d9c8d5089..bc6194698dfd 100644 --- a/trunk/kernel/irq/migration.c +++ b/trunk/kernel/irq/migration.c @@ -53,11 +53,6 @@ void irq_move_masked_irq(struct irq_data *idata) cpumask_clear(desc->pending_mask); } -void move_masked_irq(int irq) -{ - irq_move_masked_irq(irq_get_irq_data(irq)); -} - void irq_move_irq(struct irq_data *idata) { bool masked; @@ -80,8 +75,3 @@ void irq_move_irq(struct irq_data *idata) if (!masked) idata->chip->irq_unmask(idata); } - -void move_native_irq(int irq) -{ - irq_move_irq(irq_get_irq_data(irq)); -}