summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Lutomirski <luto@kernel.org>2016-09-15 22:45:42 -0700
committerIngo Molnar <mingo@kernel.org>2016-09-16 09:18:52 +0200
commitff0071c03684485495e06f3936399eb9c93141a6 (patch)
treea4e7c696c12e3f250d87b599798604324542fb11
parent4bf5beef578e46393f11eb69dda7d17a065e05ff (diff)
downloadlinux-stable-ff0071c03684485495e06f3936399eb9c93141a6.tar.gz
linux-stable-ff0071c03684485495e06f3936399eb9c93141a6.tar.bz2
linux-stable-ff0071c03684485495e06f3936399eb9c93141a6.zip
x86/entry/64: Fix a minor comment rebase error
When I rebased my thread_info changes onto Brian's switch_to() changes, I carefully checked that I fixed up all the code correctly, but I missed a comment :( Signed-off-by: Andy Lutomirski <luto@kernel.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Jann Horn <jann@thejh.net> Cc: Josh Poimboeuf <jpoimboe@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Fixes: 15f4eae70d36 ("x86: Move thread_info into task_struct") Link: http://lkml.kernel.org/r/089fe1e1cbe8b258b064fccbb1a5a5fd23861031.1474003868.git.luto@kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--arch/x86/entry/entry_64.S1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
index 2b46384b4a4f..80ab68a42621 100644
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@ -372,7 +372,6 @@ END(ptregs_\func)
/*
* %rdi: prev task
* %rsi: next task
- * rsi: task we're switching to
*/
ENTRY(__switch_to_asm)
/*