lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'core/percpu' into x86/core

Browse Source
This commit is contained in:
Ingo Molnar
2009-02-13 09:45:09 +01:00
parent f8a6b2b9ce 58105ef185
commit ab639f3593
51 changed files with 951 additions and 614 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/include/asm/processor.h
View File

@ -393,8 +393,14 @@ union irq_stack_union {
};
DECLARE_PER_CPU(union irq_stack_union, irq_stack_union);
DECLARE_INIT_PER_CPU(irq_stack_union);
DECLARE_PER_CPU(char *, irq_stack_ptr);
#else /* X86_64 */
#ifdef CONFIG_CC_STACKPROTECTOR
DECLARE_PER_CPU(unsigned long, stack_canary);
#endif
#endif /* X86_64 */
extern void print_cpu_info(struct cpuinfo_x86 *);
extern unsigned int xstate_size;