diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-31 11:32:31 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-05 16:30:01 -0500 |
| commit | 9d45cf9e36bf9bcf16df6e1cbf049807c8402823 (patch) | |
| tree | 2118a16701418af10d215d2174df7ee0a5cbe6bd /arch/x86/kernel/entry_64.S | |
| parent | a146649bc19d5eba4f5bfac6720c5f252d517a71 (diff) | |
| parent | 0cd5c3c80a0ebd68c08312fa7d8c13149cc61c4c (diff) | |
Merge branch 'x86/urgent' into x86/apic
Conflicts:
arch/x86/mach-default/setup.c
Semantic merge:
arch/x86/kernel/irqinit_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/entry_64.S')
| -rw-r--r-- | arch/x86/kernel/entry_64.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 82801fd2e931..1f7d697b5c00 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S | |||
| @@ -347,6 +347,7 @@ ENTRY(save_args) | |||
| 347 | popq_cfi %rax /* move return address... */ | 347 | popq_cfi %rax /* move return address... */ |
| 348 | mov PER_CPU_VAR(irq_stack_ptr),%rsp | 348 | mov PER_CPU_VAR(irq_stack_ptr),%rsp |
| 349 | EMPTY_FRAME 0 | 349 | EMPTY_FRAME 0 |
| 350 | pushq_cfi %rbp /* backlink for unwinder */ | ||
| 350 | pushq_cfi %rax /* ... to the new stack */ | 351 | pushq_cfi %rax /* ... to the new stack */ |
| 351 | /* | 352 | /* |
| 352 | * We entered an interrupt context - irqs are off: | 353 | * We entered an interrupt context - irqs are off: |