sched: Introduce preempt_count accessor functions

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

diff --git a/kernel/softirq.c b/kernel/softirq.c
index be3d3514c325f8aad38d62f65d2aee0393a70585..a90de70cf1f351b1643520ac076e6ba00d34f461 100644 (file)
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -106,7 +106,7 @@ static void __local_bh_disable(unsigned long ip, unsigned int cnt)
         * We must manually increment preempt_count here and manually
         * call the trace_preempt_off later.
         */
-       preempt_count() += cnt;
+       add_preempt_count_notrace(cnt);
        /*
         * Were softirqs turned off above:
         */
@@ -256,7 +256,7 @@ restart:
                                       " exited with %08x?\n", vec_nr,
                                       softirq_to_name[vec_nr], h->action,
                                       prev_count, preempt_count());
-                               preempt_count() = prev_count;
+                               preempt_count_set(prev_count);
                        }
 
                        rcu_bh_qs(cpu);
@@ -876,7 +876,6 @@ int __init __weak early_irq_init(void)
        return 0;
 }
 
-#ifdef CONFIG_GENERIC_HARDIRQS
 int __init __weak arch_probe_nr_irqs(void)
 {
        return NR_IRQS_LEGACY;
@@ -886,4 +885,3 @@ int __init __weak arch_early_irq_init(void)
 {
        return 0;
 }
-#endif