Messages in this thread Patch in this message | | | Date | Wed, 9 Jan 2008 23:04:03 +0100 | From | Andi Kleen <> | Subject | 67a385d9ac12e5940989362333b8fa8511e2ec37 in git-x86 |
| |
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
| |