git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release
[sfrench/cifs-2.6.git]
/
kernel
/
softirq.c
diff --git
a/kernel/softirq.c
b/kernel/softirq.c
index 0f546ddea43df41debcf42507ede2ac6873c80a9..d7837d45419eabbbead3886b104a697b5bcaf29c 100644
(file)
--- a/
kernel/softirq.c
+++ b/
kernel/softirq.c
@@
-3,7
+3,9
@@
*
* Copyright (C) 1992 Linus Torvalds
*
*
* Copyright (C) 1992 Linus Torvalds
*
- * Rewritten. Old one was good in 2.2, but in 2.3 it was immoral. --ANK (990903)
+ * Distribute under GPLv2.
+ *
+ * Rewritten. Old one was good in 2.2, but in 2.3 it was immoral. --ANK (990903)
*/
#include <linux/module.h>
*/
#include <linux/module.h>
@@
-271,8
+273,6
@@
asmlinkage void do_softirq(void)
local_irq_restore(flags);
}
local_irq_restore(flags);
}
-EXPORT_SYMBOL(do_softirq);
-
#endif
/*
#endif
/*
@@
-280,9
+280,14
@@
EXPORT_SYMBOL(do_softirq);
*/
void irq_enter(void)
{
*/
void irq_enter(void)
{
+#ifdef CONFIG_NO_HZ
+ int cpu = smp_processor_id();
+ if (idle_cpu(cpu) && !in_interrupt())
+ tick_nohz_stop_idle(cpu);
+#endif
__irq_enter();
#ifdef CONFIG_NO_HZ
__irq_enter();
#ifdef CONFIG_NO_HZ
- if (idle_cpu(
smp_processor_id()
))
+ if (idle_cpu(
cpu
))
tick_nohz_update_jiffies();
#endif
}
tick_nohz_update_jiffies();
#endif
}
@@
-332,8
+337,6
@@
inline fastcall void raise_softirq_irqoff(unsigned int nr)
wakeup_softirqd();
}
wakeup_softirqd();
}
-EXPORT_SYMBOL(raise_softirq_irqoff);
-
void fastcall raise_softirq(unsigned int nr)
{
unsigned long flags;
void fastcall raise_softirq(unsigned int nr)
{
unsigned long flags;