summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames C Boyd <jcboyd.dev@gmail.com>2015-07-01 22:13:26 +0200
committerIngo Molnar <mingo@kernel.org>2015-07-02 11:08:50 +0200
commit864d5bb957138d1ed9641a5eff7849a56ddadc16 (patch)
tree1ae71ae81c00d88de56da04225164d56225cca24
parentMerge branch 'x86/boot' into x86/urgent (diff)
downloadlinux-864d5bb957138d1ed9641a5eff7849a56ddadc16.tar.xz
linux-864d5bb957138d1ed9641a5eff7849a56ddadc16.zip
x86/asm/entry/64: Update path names
The paths mentioned in this file weren't updated through some file rename commits. Fix them to refer to the correct path. Signed-off-by: James C Boyd <jcboyd.dev@gmail.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: corbet@lwn.net Cc: trivial@kernel.org Link: http://lkml.kernel.org/r/1435781606-3037-1-git-send-email-jcboyd.dev@gmail.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--Documentation/x86/entry_64.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/x86/entry_64.txt b/Documentation/x86/entry_64.txt
index 33884d156125..c1df8eba9dfd 100644
--- a/Documentation/x86/entry_64.txt
+++ b/Documentation/x86/entry_64.txt
@@ -1,14 +1,14 @@
This file documents some of the kernel entries in
-arch/x86/kernel/entry_64.S. A lot of this explanation is adapted from
+arch/x86/entry/entry_64.S. A lot of this explanation is adapted from
an email from Ingo Molnar:
http://lkml.kernel.org/r/<20110529191055.GC9835%40elte.hu>
The x86 architecture has quite a few different ways to jump into
kernel code. Most of these entry points are registered in
-arch/x86/kernel/traps.c and implemented in arch/x86/kernel/entry_64.S
-for 64-bit, arch/x86/kernel/entry_32.S for 32-bit and finally
-arch/x86/ia32/ia32entry.S which implements the 32-bit compatibility
+arch/x86/kernel/traps.c and implemented in arch/x86/entry/entry_64.S
+for 64-bit, arch/x86/entry/entry_32.S for 32-bit and finally
+arch/x86/entry/entry_64_compat.S which implements the 32-bit compatibility
syscall entry points and thus provides for 32-bit processes the
ability to execute syscalls when running on 64-bit kernels.