]> Pileus Git - ~andy/linux/commitdiff
generic-ipi: Kill unnecessary variable - csd_flags
authorXie XiuQi <xiexiuqi@huawei.com>
Tue, 30 Jul 2013 03:06:09 +0000 (11:06 +0800)
committerIngo Molnar <mingo@kernel.org>
Tue, 30 Jul 2013 20:19:05 +0000 (22:19 +0200)
After commit 8969a5ede0f9e17da4b943712429aef2c9bcd82b
("generic-ipi: remove kmalloc()"), wait = 0 can be guaranteed,
and all callsites of generic_exec_single() do an unconditional
csd_lock() now.

So csd_flags is unnecessary now. Remove it.

Signed-off-by: Xie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Nick Piggin <npiggin@suse.de>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Link: http://lkml.kernel.org/r/51F72DA1.7010401@huawei.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
kernel/smp.c

index fe9f773d71146c82ad9c543ab0456490c9bebd0f..7332697cd184194424369173a5675be90f34768f 100644 (file)
@@ -186,25 +186,13 @@ void generic_smp_call_function_single_interrupt(void)
 
        while (!list_empty(&list)) {
                struct call_single_data *csd;
-               unsigned int csd_flags;
 
                csd = list_entry(list.next, struct call_single_data, list);
                list_del(&csd->list);
 
-               /*
-                * 'csd' can be invalid after this call if flags == 0
-                * (when called through generic_exec_single()),
-                * so save them away before making the call:
-                */
-               csd_flags = csd->flags;
-
                csd->func(csd->info);
 
-               /*
-                * Unlocked CSDs are valid through generic_exec_single():
-                */
-               if (csd_flags & CSD_FLAG_LOCK)
-                       csd_unlock(csd);
+               csd_unlock(csd);
        }
 }