From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752327AbbJLOb1 (ORCPT ); Mon, 12 Oct 2015 10:31:27 -0400 Received: from terminus.zytor.com ([198.137.202.10]:48029 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751943AbbJLObI (ORCPT ); Mon, 12 Oct 2015 10:31:08 -0400 Date: Mon, 12 Oct 2015 07:30:41 -0700 From: tip-bot for Gabriel Laskar Message-ID: Cc: linux-kernel@vger.kernel.org, mingo@kernel.org, gabriel@lse.epita.fr, tglx@linutronix.de, arnd@arndb.de, hpa@zytor.com, gregkh@linuxfoundation.org, bp@suse.de Reply-To: arnd@arndb.de, tglx@linutronix.de, gabriel@lse.epita.fr, mingo@kernel.org, linux-kernel@vger.kernel.org, bp@suse.de, gregkh@linuxfoundation.org, hpa@zytor.com In-Reply-To: <1444141657-14898-2-git-send-email-gabriel@lse.epita.fr> References: <1444141657-14898-2-git-send-email-gabriel@lse.epita.fr> To: linux-tip-commits@vger.kernel.org Subject: [tip:ras/core] x86/mce: Include linux/ioctl.h in uapi mce header Git-Commit-ID: 7e0abcd6b7ec1452bf4a850fccbae44043c05806 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: 7e0abcd6b7ec1452bf4a850fccbae44043c05806 Gitweb: http://git.kernel.org/tip/7e0abcd6b7ec1452bf4a850fccbae44043c05806 Author: Gabriel Laskar AuthorDate: Tue, 6 Oct 2015 16:27:35 +0200 Committer: Thomas Gleixner CommitDate: Sun, 11 Oct 2015 21:24:27 +0200 x86/mce: Include linux/ioctl.h in uapi mce header asm/ioctls.h contains definition for termios, not just the _IO* macros. This error was found with a tool in development used to generate automated pretty-printing functions for ioctl decoding in strace. Signed-off-by: Gabriel Laskar Acked-by: Arnd Bergmann Cc: Greg Kroah-Hartman Cc: Borislav Petkov Link: http://lkml.kernel.org/r/1444141657-14898-2-git-send-email-gabriel@lse.epita.fr Signed-off-by: Thomas Gleixner --- arch/x86/include/uapi/asm/mce.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/uapi/asm/mce.h b/arch/x86/include/uapi/asm/mce.h index 76880ed..03429da 100644 --- a/arch/x86/include/uapi/asm/mce.h +++ b/arch/x86/include/uapi/asm/mce.h @@ -2,7 +2,7 @@ #define _UAPI_ASM_X86_MCE_H #include -#include +#include /* Fields are zero when not available */ struct mce {