projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Btrfs: re-add root to dead root list if we stop dropping it
[deliverable/linux.git]
/
kernel
/
timer.c
diff --git
a/kernel/timer.c
b/kernel/timer.c
index 15bc1b41021dae203b7d3c43293b5edd54cff4cb..4296d13db3d15876f320070caee26c9a6ff06e6d 100644
(file)
--- a/
kernel/timer.c
+++ b/
kernel/timer.c
@@
-1505,11
+1505,11
@@
signed long __sched schedule_timeout_uninterruptible(signed long timeout)
}
EXPORT_SYMBOL(schedule_timeout_uninterruptible);
}
EXPORT_SYMBOL(schedule_timeout_uninterruptible);
-static int
__cpuinit
init_timers_cpu(int cpu)
+static int init_timers_cpu(int cpu)
{
int j;
struct tvec_base *base;
{
int j;
struct tvec_base *base;
- static char
__cpuinitdata
tvec_base_done[NR_CPUS];
+ static char tvec_base_done[NR_CPUS];
if (!tvec_base_done[cpu]) {
static char boot_done;
if (!tvec_base_done[cpu]) {
static char boot_done;
@@
-1577,7
+1577,7
@@
static void migrate_timer_list(struct tvec_base *new_base, struct list_head *hea
}
}
}
}
-static void
__cpuinit
migrate_timers(int cpu)
+static void migrate_timers(int cpu)
{
struct tvec_base *old_base;
struct tvec_base *new_base;
{
struct tvec_base *old_base;
struct tvec_base *new_base;
@@
-1610,7
+1610,7
@@
static void __cpuinit migrate_timers(int cpu)
}
#endif /* CONFIG_HOTPLUG_CPU */
}
#endif /* CONFIG_HOTPLUG_CPU */
-static int
__cpuinit
timer_cpu_notify(struct notifier_block *self,
+static int timer_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu)
{
long cpu = (long)hcpu;
unsigned long action, void *hcpu)
{
long cpu = (long)hcpu;
@@
-1635,7
+1635,7
@@
static int __cpuinit timer_cpu_notify(struct notifier_block *self,
return NOTIFY_OK;
}
return NOTIFY_OK;
}
-static struct notifier_block
__cpuinitdata
timers_nb = {
+static struct notifier_block timers_nb = {
.notifier_call = timer_cpu_notify,
};
.notifier_call = timer_cpu_notify,
};
This page took
0.085511 seconds
and
5
git commands to generate.