|
@@ -1219,11 +1219,11 @@ asmlinkage long sys_sysinfo(struct sysinfo __user *info)
|
|
*/
|
|
*/
|
|
static struct lock_class_key base_lock_keys[NR_CPUS];
|
|
static struct lock_class_key base_lock_keys[NR_CPUS];
|
|
|
|
|
|
-static int __devinit init_timers_cpu(int cpu)
|
|
|
|
|
|
+static int __cpuinit init_timers_cpu(int cpu)
|
|
{
|
|
{
|
|
int j;
|
|
int j;
|
|
tvec_base_t *base;
|
|
tvec_base_t *base;
|
|
- static char __devinitdata tvec_base_done[NR_CPUS];
|
|
|
|
|
|
+ static char __cpuinitdata tvec_base_done[NR_CPUS];
|
|
|
|
|
|
if (!tvec_base_done[cpu]) {
|
|
if (!tvec_base_done[cpu]) {
|
|
static char boot_done;
|
|
static char boot_done;
|