diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-03-23 09:50:03 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-03-23 16:20:20 -0400 |
| commit | 80c5520811d3805adcb15c570ea5e2d489fa5d0b (patch) | |
| tree | ae797a7f4af39f80e77526533d06ac23b439f0ab /arch/x86/include/asm/cpumask.h | |
| parent | b3e3b302cf6dc8d60b67f0e84d1fa5648889c038 (diff) | |
| parent | 8c083f081d0014057901c68a0a3e0f8ca7ac8d23 (diff) | |
Merge branch 'cpus4096' into irq/threaded
Conflicts:
arch/parisc/kernel/irq.c
kernel/irq/handle.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/include/asm/cpumask.h')
| -rw-r--r-- | arch/x86/include/asm/cpumask.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/x86/include/asm/cpumask.h b/arch/x86/include/asm/cpumask.h new file mode 100644 index 00000000000..61c852fa346 --- /dev/null +++ b/arch/x86/include/asm/cpumask.h | |||
| @@ -0,0 +1,14 @@ | |||
| 1 | #ifndef _ASM_X86_CPUMASK_H | ||
| 2 | #define _ASM_X86_CPUMASK_H | ||
| 3 | #ifndef __ASSEMBLY__ | ||
| 4 | #include <linux/cpumask.h> | ||
| 5 | |||
| 6 | extern cpumask_var_t cpu_callin_mask; | ||
| 7 | extern cpumask_var_t cpu_callout_mask; | ||
| 8 | extern cpumask_var_t cpu_initialized_mask; | ||
| 9 | extern cpumask_var_t cpu_sibling_setup_mask; | ||
| 10 | |||
| 11 | extern void setup_cpu_local_masks(void); | ||
| 12 | |||
| 13 | #endif /* __ASSEMBLY__ */ | ||
| 14 | #endif /* _ASM_X86_CPUMASK_H */ | ||