From: tip-bot for Gabriel Laskar <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
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
Subject: [tip:ras/core] x86/mce: Include linux/ioctl.h in uapi mce header
Date: Mon, 12 Oct 2015 07:30:41 -0700 [thread overview]
Message-ID: <tip-7e0abcd6b7ec1452bf4a850fccbae44043c05806@git.kernel.org> (raw)
In-Reply-To: <1444141657-14898-2-git-send-email-gabriel@lse.epita.fr>
Commit-ID: 7e0abcd6b7ec1452bf4a850fccbae44043c05806
Gitweb: http://git.kernel.org/tip/7e0abcd6b7ec1452bf4a850fccbae44043c05806
Author: Gabriel Laskar <gabriel@lse.epita.fr>
AuthorDate: Tue, 6 Oct 2015 16:27:35 +0200
Committer: Thomas Gleixner <tglx@linutronix.de>
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 <gabriel@lse.epita.fr>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Borislav Petkov <bp@suse.de>
Link: http://lkml.kernel.org/r/1444141657-14898-2-git-send-email-gabriel@lse.epita.fr
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
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 <linux/types.h>
-#include <asm/ioctls.h>
+#include <linux/ioctl.h>
/* Fields are zero when not available */
struct mce {
next prev parent reply other threads:[~2015-10-12 14:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1444141657-14898-1-git-send-email-gabriel@lse.epita.fr>
2015-10-06 14:27 ` [PATCH v2 1/3] mce: change asm/ioctls.h for linux/ioctl.h Gabriel Laskar
2015-10-12 14:30 ` tip-bot for Gabriel Laskar [this message]
2015-10-06 14:27 ` [PATCH v2 2/3] msm: remove unused header Gabriel Laskar
2015-10-06 14:27 ` [PATCH v2 3/3] falloc: expose ioctl numbers into uapi Gabriel Laskar
2015-10-06 14:43 ` Yann Droneaud
2015-10-06 16:21 ` [PATCH v3] " Gabriel Laskar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-7e0abcd6b7ec1452bf4a850fccbae44043c05806@git.kernel.org \
--to=tipbot@zytor.com \
--cc=arnd@arndb.de \
--cc=bp@suse.de \
--cc=gabriel@lse.epita.fr \
--cc=gregkh@linuxfoundation.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®