Skip to content

L
linux-davinci
Commit 9f02d6b7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

parents 9ffc7a0e c12a8289
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
arch/sparc64/kernel/smp.c
View file @ 9f02d6b7
...@@ -45,8 +45,8 @@ extern void calibrate_delay(void); ...@@ -45,8 +45,8 @@ extern void calibrate_delay(void);
/* Please don't make this stuff initdata!!! --DaveM */ /* Please don't make this stuff initdata!!! --DaveM */
static unsigned char boot_cpu_id; static unsigned char boot_cpu_id;
cpumask_t cpu_online_map = CPU_MASK_NONE __read_mostly; cpumask_t cpu_online_map __read_mostly = CPU_MASK_NONE;
cpumask_t phys_cpu_present_map = CPU_MASK_NONE __read_mostly; cpumask_t phys_cpu_present_map __read_mostly = CPU_MASK_NONE;
static cpumask_t smp_commenced_mask; static cpumask_t smp_commenced_mask;
static cpumask_t cpu_callout_map; static cpumask_t cpu_callout_map;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment