From 82648f9a2526b502ba4675cb1f7e6e30058e9fbd Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Sun, 6 Dec 2009 00:52:56 +0100
Subject: [PATCH] --- yaml --- r: 175391 b: refs/heads/master c:
 b625b3b3b740e177a1148594cd3ad5ff52f35315 h: refs/heads/master i:   175389:
 2f7edaa25efa689605d19bd9ed9cf2bf00975ae8   175387:
 fe4aeb22251bb32bcf5005b860ee372353771734   175383:
 e73e4c0df015e4ca6908b8199422030149bcd7bc   175375:
 340f3edff9f7853b939b7d12629f03aa1352552a   175359:
 e3cdc93e659c2d7657be454cd0b410f302ac7e5a v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/kernel/entry_64.S | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e4dfcdd7e1e0..b73c118e216b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f33f9c5cc3c99aeaf4d266a7ed502b828115a53
+refs/heads/master: b625b3b3b740e177a1148594cd3ad5ff52f35315
diff --git a/trunk/arch/x86/kernel/entry_64.S b/trunk/arch/x86/kernel/entry_64.S
index 722df1b1152d..0f08a0cea3e0 100644
--- a/trunk/arch/x86/kernel/entry_64.S
+++ b/trunk/arch/x86/kernel/entry_64.S
@@ -1076,10 +1076,10 @@ ENTRY(\sym)
 	TRACE_IRQS_OFF
 	movq %rsp,%rdi		/* pt_regs pointer */
 	xorl %esi,%esi		/* no error code */
-	PER_CPU(init_tss, %rbp)
-	subq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp)
+	PER_CPU(init_tss, %r12)
+	subq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%r12)
 	call \do_sym
-	addq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp)
+	addq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%r12)
 	jmp paranoid_exit	/* %ebx: no swapgs flag */
 	CFI_ENDPROC
 END(\sym)