kernel/timer.c: convert compat_sys_sysinfo to COMPAT_SYSCALL_DEFINE

[karo-tx-linux.git] / kernel / softirq.c

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;