diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-18 17:41:32 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-18 17:41:32 +0100 |
commit | 99937d6455cea95405ac681c86a857d0fcd530bd (patch) | |
tree | 5a40a9ca966e5feda1040f9ef2c7798ac4d1e234 /arch/x86/include/asm/page_64.h | |
parent | 74e7904559a10cbb9fbf9139c5c42fc87c0f62a4 (diff) | |
parent | 87b264065880fa696c121dad8498a60524e0f6de (diff) | |
download | talos-obmc-linux-99937d6455cea95405ac681c86a857d0fcd530bd.tar.gz talos-obmc-linux-99937d6455cea95405ac681c86a857d0fcd530bd.zip |
Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu
Diffstat (limited to 'arch/x86/include/asm/page_64.h')
-rw-r--r-- | arch/x86/include/asm/page_64.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h index 5ebca29f44f0..e27fdbe5f9e4 100644 --- a/arch/x86/include/asm/page_64.h +++ b/arch/x86/include/asm/page_64.h @@ -13,8 +13,8 @@ #define DEBUG_STACK_ORDER (EXCEPTION_STACK_ORDER + 1) #define DEBUG_STKSZ (PAGE_SIZE << DEBUG_STACK_ORDER) -#define IRQSTACK_ORDER 2 -#define IRQSTACKSIZE (PAGE_SIZE << IRQSTACK_ORDER) +#define IRQ_STACK_ORDER 2 +#define IRQ_STACK_SIZE (PAGE_SIZE << IRQ_STACK_ORDER) #define STACKFAULT_STACK 1 #define DOUBLEFAULT_STACK 2 |