diff options
author | Paul E. McKenney <paul.mckenney@linaro.org> | 2012-01-06 19:59:51 -0500 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2012-02-21 12:03:27 -0500 |
commit | bc399d6e6ed8615007110f5e438886ffd236760e (patch) | |
tree | f1ed750763453e0dfbe80b4d40b09338559aeb4e /arch/s390/kernel | |
parent | 5c8806a037ad4f53259146060b32600566475e29 (diff) |
s390: Convert call_rcu() to kfree_rcu(), drop ext_int_hash_update()
The call_rcu() in unregister_external_interrupt() invokes
ext_int_hash_update(), which just does a kfree(). Convert the
call_rcu() to kfree_rcu(), allowing ext_int_hash_update() to
be eliminated.
Signed-off-by: Paul E. McKenney <paul.mckenney@linaro.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel')
-rw-r--r-- | arch/s390/kernel/irq.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c index b9a7fdd9c814..e30b2dfa8ba0 100644 --- a/arch/s390/kernel/irq.c +++ b/arch/s390/kernel/irq.c | |||
@@ -165,13 +165,6 @@ static inline int ext_hash(u16 code) | |||
165 | return (code + (code >> 9)) & 0xff; | 165 | return (code + (code >> 9)) & 0xff; |
166 | } | 166 | } |
167 | 167 | ||
168 | static void ext_int_hash_update(struct rcu_head *head) | ||
169 | { | ||
170 | struct ext_int_info *p = container_of(head, struct ext_int_info, rcu); | ||
171 | |||
172 | kfree(p); | ||
173 | } | ||
174 | |||
175 | int register_external_interrupt(u16 code, ext_int_handler_t handler) | 168 | int register_external_interrupt(u16 code, ext_int_handler_t handler) |
176 | { | 169 | { |
177 | struct ext_int_info *p; | 170 | struct ext_int_info *p; |
@@ -202,7 +195,7 @@ int unregister_external_interrupt(u16 code, ext_int_handler_t handler) | |||
202 | list_for_each_entry_rcu(p, &ext_int_hash[index], entry) | 195 | list_for_each_entry_rcu(p, &ext_int_hash[index], entry) |
203 | if (p->code == code && p->handler == handler) { | 196 | if (p->code == code && p->handler == handler) { |
204 | list_del_rcu(&p->entry); | 197 | list_del_rcu(&p->entry); |
205 | call_rcu(&p->rcu, ext_int_hash_update); | 198 | kfree_rcu(p, rcu); |
206 | } | 199 | } |
207 | spin_unlock_irqrestore(&ext_int_hash_lock, flags); | 200 | spin_unlock_irqrestore(&ext_int_hash_lock, flags); |
208 | return 0; | 201 | return 0; |