projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'akpm' (patches from Andrew)
[cascardo/linux.git]
/
kernel
/
softirq.c
diff --git
a/kernel/softirq.c
b/kernel/softirq.c
index
6676264
..
744fa61
100644
(file)
--- a/
kernel/softirq.c
+++ b/
kernel/softirq.c
@@
-58,7
+58,7
@@
static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp
DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
const char * const softirq_to_name[NR_SOFTIRQS] = {
DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
const char * const softirq_to_name[NR_SOFTIRQS] = {
- "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "
BLOCK_IO
POLL",
+ "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "
IRQ_
POLL",
"TASKLET", "SCHED", "HRTIMER", "RCU"
};
"TASKLET", "SCHED", "HRTIMER", "RCU"
};
@@
-496,7
+496,7
@@
void __tasklet_hi_schedule_first(struct tasklet_struct *t)
}
EXPORT_SYMBOL(__tasklet_hi_schedule_first);
}
EXPORT_SYMBOL(__tasklet_hi_schedule_first);
-static void tasklet_action(struct softirq_action *a)
+static
__latent_entropy
void tasklet_action(struct softirq_action *a)
{
struct tasklet_struct *list;
{
struct tasklet_struct *list;
@@
-532,7
+532,7
@@
static void tasklet_action(struct softirq_action *a)
}
}
}
}
-static void tasklet_hi_action(struct softirq_action *a)
+static
__latent_entropy
void tasklet_hi_action(struct softirq_action *a)
{
struct tasklet_struct *list;
{
struct tasklet_struct *list;