From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754808AbbGCHvA (ORCPT ); Fri, 3 Jul 2015 03:51:00 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36249 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754751AbbGCHut (ORCPT ); Fri, 3 Jul 2015 03:50:49 -0400 Date: Fri, 3 Jul 2015 00:50:17 -0700 From: tip-bot for James C Boyd Message-ID: Cc: mingo@kernel.org, peterz@infradead.org, linux-kernel@vger.kernel.org, hpa@zytor.com, tglx@linutronix.de, jcboyd.dev@gmail.com, torvalds@linux-foundation.org Reply-To: torvalds@linux-foundation.org, hpa@zytor.com, tglx@linutronix.de, jcboyd.dev@gmail.com, linux-kernel@vger.kernel.org, mingo@kernel.org, peterz@infradead.org In-Reply-To: <1435781606-3037-1-git-send-email-jcboyd.dev@gmail.com> References: <1435781606-3037-1-git-send-email-jcboyd.dev@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/asm/entry/64: Update path names Git-Commit-ID: 864d5bb957138d1ed9641a5eff7849a56ddadc16 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 864d5bb957138d1ed9641a5eff7849a56ddadc16 Gitweb: http://git.kernel.org/tip/864d5bb957138d1ed9641a5eff7849a56ddadc16 Author: James C Boyd AuthorDate: Wed, 1 Jul 2015 15:13:26 -0500 Committer: Ingo Molnar CommitDate: Thu, 2 Jul 2015 11:08:50 +0200 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 Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner 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 --- Documentation/x86/entry_64.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/x86/entry_64.txt b/Documentation/x86/entry_64.txt index 33884d1..c1df8eb 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.