kernel/smp.c: remove 'priv' of call_single_data

The 'priv' field is redundant; we can pass data via 'info'.

Signed-off-by: liguang <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Oleg Nesterov <[email protected]>
Cc: Ingo Molnar <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/include/linux/smp.h b/include/linux/smp.h
index 3e07a7df6478a18ffa188c5cc4d1bc7d287fba49..e6564c1dc552c6ca72b9b3b276fdb455a10bc716 100644 (file)
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -20,7 +20,6 @@ struct call_single_data {
        smp_call_func_t func;
        void *info;
        u16 flags;
-       u16 priv;
 };
 
 /* total number of cpus in this system (may exceed NR_CPUS) */

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 14d7758074aadf4d1c43947ecef675e8bb6c044e..aa82723c72027a86e67914e8a7b765613c06fbc6 100644 (file)
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -620,8 +620,7 @@ static void remote_softirq_receive(void *data)
        unsigned long flags;
        int softirq;
 
-       softirq = cp->priv;
-
+       softirq = *(int *)cp->info;
        local_irq_save(flags);
        __local_trigger(cp, softirq);
        local_irq_restore(flags);
@@ -631,9 +630,8 @@ static int __try_remote_softirq(struct call_single_data *cp, int cpu, int softir
 {
        if (cpu_online(cpu)) {
                cp->func = remote_softirq_receive;
-               cp->info = cp;
+               cp->info = &softirq;
                cp->flags = 0;
-               cp->priv = softirq;
 
                __smp_call_function_single(cpu, cp, 0);
                return 0;