[tip:ras/core] x86/mce: Include linux/ioctl.h in uapi mce header

From: tip-bot for Gabriel Laskar
Date: Mon Oct 12 2015 - 10:31:30 EST


Commit-ID: 7e0abcd6b7ec1452bf4a850fccbae44043c05806
Gitweb: http://git.kernel.org/tip/7e0abcd6b7ec1452bf4a850fccbae44043c05806
Author: Gabriel Laskar <gabriel@xxxxxxxxxxxx>
AuthorDate: Tue, 6 Oct 2015 16:27:35 +0200
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
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@xxxxxxxxxxxx>
Acked-by: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Cc: Borislav Petkov <bp@xxxxxxx>
Link: http://lkml.kernel.org/r/1444141657-14898-2-git-send-email-gabriel@xxxxxxxxxxxx
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
---
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 {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/