Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1484827

[tip:x86/asm] x86/entry/64: Fix a minor comment rebase error

Show all headers | View raw

Commit-ID:  ff0071c03684485495e06f3936399eb9c93141a6
Gitweb:     http://git.kernel.org/tip/ff0071c03684485495e06f3936399eb9c93141a6
Author:     Andy Lutomirski <luto@kernel.org>
AuthorDate: Thu, 15 Sep 2016 22:45:42 -0700
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 16 Sep 2016 09:18:52 +0200

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>
---
 arch/x86/entry/entry_64.S | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
index 2b46384..80ab68a 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)
 	/*

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/8] thread_info cleanups and stack caching Andy Lutomirski <luto@kernel.org> - 2016-09-16 07:50 +0200
  [PATCH v2 1/8] x86/entry/64: Fix a minor comment rebase error Andy Lutomirski <luto@kernel.org> - 2016-09-16 07:50 +0200
    [tip:x86/asm] x86/entry/64: Fix a minor comment rebase error tip-bot for Andy Lutomirski <tipbot@zytor.com> - 2016-09-16 11:20 +0200
  [PATCH v2 4/8] x86/dumpstack: Pin the target stack when dumping it Andy Lutomirski <luto@kernel.org> - 2016-09-16 07:50 +0200
    [tip:x86/asm] x86/dumpstack: Pin the target stack when dumping it tip-bot for Andy Lutomirski <tipbot@zytor.com> - 2016-09-16 11:20 +0200
      Re: [tip:x86/asm] x86/dumpstack: Pin the target stack when dumping it Josh Poimboeuf <jpoimboe@redhat.com> - 2016-09-16 14:00 +0200
        Re: [tip:x86/asm] x86/dumpstack: Pin the target stack when dumping it Josh Poimboeuf <jpoimboe@redhat.com> - 2016-09-16 14:30 +0200
          Re: [tip:x86/asm] x86/dumpstack: Pin the target stack when dumping it Ingo Molnar <mingo@kernel.org> - 2016-09-16 15:00 +0200
            [PATCH] x86/dumpstack: remove NULL task pointer convention Josh Poimboeuf <jpoimboe@redhat.com> - 2016-09-16 15:10 +0200
  [PATCH v2 6/8] lib/syscall: Pin the task stack in collect_syscall() Andy Lutomirski <luto@kernel.org> - 2016-09-16 07:50 +0200
    [tip:x86/asm] lib/syscall: Pin the task stack in collect_syscall() tip-bot for Andy Lutomirski <tipbot@zytor.com> - 2016-09-16 11:20 +0200
  [PATCH v2 8/8] fork: Cache two thread stacks per cpu if CONFIG_VMAP_STACK is set Andy Lutomirski <luto@kernel.org> - 2016-09-16 07:50 +0200
    [tip:x86/asm] fork: Optimize task creation by caching two thread  stacks per CPU if CONFIG_VMAP_STACK=y tip-bot for Andy Lutomirski <tipbot@zytor.com> - 2016-09-16 11:30 +0200
  [PATCH v2 3/8] kthread: to_live_kthread() needs try_get_task_stack() Andy Lutomirski <luto@kernel.org> - 2016-09-16 07:50 +0200
    [tip:x86/asm] kthread: Pin the stack via  try_get_task_stack()/put_task_stack() in to_live_kthread() function tip-bot for Oleg Nesterov <tipbot@zytor.com> - 2016-09-16 11:20 +0200

csiph-web