From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757190AbbGGKzT (ORCPT ); Tue, 7 Jul 2015 06:55:19 -0400 Received: from terminus.zytor.com ([198.137.202.10]:60110 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757171AbbGGKzH (ORCPT ); Tue, 7 Jul 2015 06:55:07 -0400 Date: Tue, 7 Jul 2015 03:54:13 -0700 From: tip-bot for Andy Lutomirski Message-ID: Cc: oleg@redhat.com, vda.linux@googlemail.com, tglx@linutronix.de, brgerst@gmail.com, luto@amacapital.net, bp@alien8.de, torvalds@linux-foundation.org, luto@kernel.org, riel@redhat.com, hpa@zytor.com, keescook@chromium.org, mingo@kernel.org, linux-kernel@vger.kernel.org, fweisbec@gmail.com, peterz@infradead.org, dvlasenk@redhat.com Reply-To: riel@redhat.com, luto@kernel.org, hpa@zytor.com, keescook@chromium.org, mingo@kernel.org, fweisbec@gmail.com, linux-kernel@vger.kernel.org, dvlasenk@redhat.com, peterz@infradead.org, oleg@redhat.com, vda.linux@googlemail.com, tglx@linutronix.de, brgerst@gmail.com, luto@amacapital.net, bp@alien8.de, torvalds@linux-foundation.org In-Reply-To: <854e9b45f69af20e26c47099eb236321563ebcee.1435952415.git.luto@kernel.org> References: <854e9b45f69af20e26c47099eb236321563ebcee.1435952415.git.luto@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/entry: Remove SCHEDULE_USER and asm/ context-tracking.h Git-Commit-ID: 06a7b36c7bd932e60997bedbae32b3d8e6722281 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: 06a7b36c7bd932e60997bedbae32b3d8e6722281 Gitweb: http://git.kernel.org/tip/06a7b36c7bd932e60997bedbae32b3d8e6722281 Author: Andy Lutomirski AuthorDate: Fri, 3 Jul 2015 12:44:33 -0700 Committer: Ingo Molnar CommitDate: Tue, 7 Jul 2015 10:59:09 +0200 x86/entry: Remove SCHEDULE_USER and asm/context-tracking.h SCHEDULE_USER is no longer used, and asm/context-tracking.h contained nothing else. Remove the header entirely. Signed-off-by: Andy Lutomirski Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: Denys Vlasenko Cc: Frederic Weisbecker Cc: H. Peter Anvin Cc: Kees Cook Cc: Linus Torvalds Cc: Oleg Nesterov Cc: Peter Zijlstra Cc: Rik van Riel Cc: Thomas Gleixner Cc: paulmck@linux.vnet.ibm.com Link: http://lkml.kernel.org/r/854e9b45f69af20e26c47099eb236321563ebcee.1435952415.git.luto@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/entry/entry_64.S | 1 - arch/x86/include/asm/context_tracking.h | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 168ee26..041a37a 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/x86/include/asm/context_tracking.h b/arch/x86/include/asm/context_tracking.h deleted file mode 100644 index 1fe4970..0000000 --- a/arch/x86/include/asm/context_tracking.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef _ASM_X86_CONTEXT_TRACKING_H -#define _ASM_X86_CONTEXT_TRACKING_H - -#ifdef CONFIG_CONTEXT_TRACKING -# define SCHEDULE_USER call schedule_user -#else -# define SCHEDULE_USER call schedule -#endif - -#endif