| From ff0071c03684485495e06f3936399eb9c93141a6 Mon Sep 17 00:00:00 2001 |
| From: Andy Lutomirski <luto@kernel.org> |
| Date: Thu, 15 Sep 2016 22:45:42 -0700 |
| Subject: [PATCH] x86/entry/64: Fix a minor comment rebase error |
| |
| commit ff0071c03684485495e06f3936399eb9c93141a6 upstream. |
| |
| 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> |
| |
| 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) |
| /* |
| -- |
| 2.15.0 |
| |
