From: Andi Kleen <andi@firstfloor.org>
To: mingo@elte.hu, jason.wessel@windriver.com, tglx@linutronix.de
Cc: linux-kernel@vger.kernel.org
Subject: 67a385d9ac12e5940989362333b8fa8511e2ec37 in git-x86
Date: Wed, 9 Jan 2008 23:04:03 +0100 [thread overview]
Message-ID: <20080109220403.GA18304@basil.nowhere.org> (raw)
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
reply other threads:[~2008-01-09 22:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080109220403.GA18304@basil.nowhere.org \
--to=andi@firstfloor.org \
--cc=jason.wessel@windriver.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.