* 67a385d9ac12e5940989362333b8fa8511e2ec37 in git-x86
@ 2008-01-09 22:04 Andi Kleen
0 siblings, 0 replies; only message in thread
From: Andi Kleen @ 2008-01-09 22:04 UTC (permalink / raw)
To: mingo, jason.wessel, tglx; +Cc: linux-kernel
ommit 67a385d9ac12e5940989362333b8fa8511e2ec37
Author: Ingo Molnar <mingo@elte.hu>
Date: Wed Jan 9 13:31:08 2008 +0100
x86: fix up merge conflict
fix up kgdb merge conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/include/asm-x86/system.h b/include/asm-x86/system.h
index d3c225b..72bbaff 100644
--- a/include/asm-x86/system.h
+++ b/include/asm-x86/system.h
@@ -63,7 +63,9 @@ extern struct task_struct *FASTCALL(__switch_to(struct task_struct *prev,
/* Save restore flags to clear handle leaking NT */
#define switch_to(prev, next, last) \
- asm volatile(SAVE_CONTEXT \
+ asm volatile(".globl __switch_to_begin\n\t" \
+ "__switch_to_begin:\n\t" \
+ SAVE_CONTEXT \
"movq %%rsp,%P[threadrsp](%[prev])\n\t" /* save
AK:
Can't remember how often I reject similar patches. They usually point
to someone implementing backtraces wrong.
Anyways, the label seems to be completely unused in the current kgdb
code the change can just go completely:
% grep -r switch_to_begin *
include/asm-x86/system.h: asm volatile(".globl __switch_to_begin\n\t" \
include/asm-x86/system.h: "__switch_to_begin:\n\t"
-Andi
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2008-01-09 22:04 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-01-09 22:04 67a385d9ac12e5940989362333b8fa8511e2ec37 in git-x86 Andi Kleen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.