* [PATCH v2 1/3] mce: change asm/ioctls.h for linux/ioctl.h
[not found] <1444141657-14898-1-git-send-email-gabriel@lse.epita.fr>
@ 2015-10-06 14:27 ` Gabriel Laskar
2015-10-12 14:30 ` [tip:ras/core] x86/mce: Include linux/ioctl.h in uapi mce header tip-bot for Gabriel Laskar
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
2 siblings, 1 reply; 6+ messages in thread
From: Gabriel Laskar @ 2015-10-06 14:27 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT),
Arnd Bergmann, Gabriel Laskar, Borislav Petkov,
open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)
Cc: Greg Kroah-Hartman
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>
---
v2: commit message
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 {
--
2.6.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 2/3] msm: remove unused header
[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-06 14:27 ` Gabriel Laskar
2015-10-06 14:27 ` [PATCH v2 3/3] falloc: expose ioctl numbers into uapi Gabriel Laskar
2 siblings, 0 replies; 6+ messages in thread
From: Gabriel Laskar @ 2015-10-06 14:27 UTC (permalink / raw)
To: Arnd Bergmann, Gabriel Laskar, open list; +Cc: Greg Kroah-Hartman
Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr>
Acked-by: Arnd Bergmann <arnd@arndb.de>
---
include/linux/msm_mdp.h | 79 -------------------------------------------------
1 file changed, 79 deletions(-)
delete mode 100644 include/linux/msm_mdp.h
diff --git a/include/linux/msm_mdp.h b/include/linux/msm_mdp.h
deleted file mode 100644
index fe722c1..0000000
--- a/include/linux/msm_mdp.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* include/linux/msm_mdp.h
- *
- * Copyright (C) 2007 Google Incorporated
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
-#ifndef _MSM_MDP_H_
-#define _MSM_MDP_H_
-
-#include <linux/types.h>
-
-#define MSMFB_IOCTL_MAGIC 'm'
-#define MSMFB_GRP_DISP _IOW(MSMFB_IOCTL_MAGIC, 1, unsigned int)
-#define MSMFB_BLIT _IOW(MSMFB_IOCTL_MAGIC, 2, unsigned int)
-
-enum {
- MDP_RGB_565, /* RGB 565 planar */
- MDP_XRGB_8888, /* RGB 888 padded */
- MDP_Y_CBCR_H2V2, /* Y and CbCr, pseudo planar w/ Cb is in MSB */
- MDP_ARGB_8888, /* ARGB 888 */
- MDP_RGB_888, /* RGB 888 planar */
- MDP_Y_CRCB_H2V2, /* Y and CrCb, pseudo planar w/ Cr is in MSB */
- MDP_YCRYCB_H2V1, /* YCrYCb interleave */
- MDP_Y_CRCB_H2V1, /* Y and CrCb, pseduo planar w/ Cr is in MSB */
- MDP_Y_CBCR_H2V1, /* Y and CrCb, pseduo planar w/ Cr is in MSB */
- MDP_RGBA_8888, /* ARGB 888 */
- MDP_BGRA_8888, /* ABGR 888 */
- MDP_RGBX_8888, /* RGBX 888 */
- MDP_IMGTYPE_LIMIT /* Non valid image type after this enum */
-};
-
-enum {
- PMEM_IMG,
- FB_IMG,
-};
-
-/* flag values */
-#define MDP_ROT_NOP 0
-#define MDP_FLIP_LR 0x1
-#define MDP_FLIP_UD 0x2
-#define MDP_ROT_90 0x4
-#define MDP_ROT_180 (MDP_FLIP_UD|MDP_FLIP_LR)
-#define MDP_ROT_270 (MDP_ROT_90|MDP_FLIP_UD|MDP_FLIP_LR)
-#define MDP_DITHER 0x8
-#define MDP_BLUR 0x10
-
-#define MDP_TRANSP_NOP 0xffffffff
-#define MDP_ALPHA_NOP 0xff
-
-struct mdp_rect {
- u32 x, y, w, h;
-};
-
-struct mdp_img {
- u32 width, height, format, offset;
- int memory_id; /* the file descriptor */
-};
-
-struct mdp_blit_req {
- struct mdp_img src;
- struct mdp_img dst;
- struct mdp_rect src_rect;
- struct mdp_rect dst_rect;
- u32 alpha, transp_mask, flags;
-};
-
-struct mdp_blit_req_list {
- u32 count;
- struct mdp_blit_req req[];
-};
-
-#endif /* _MSM_MDP_H_ */
--
2.6.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 3/3] falloc: expose ioctl numbers into uapi
[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-06 14:27 ` [PATCH v2 2/3] msm: remove unused header Gabriel Laskar
@ 2015-10-06 14:27 ` Gabriel Laskar
2015-10-06 14:43 ` Yann Droneaud
2015-10-06 16:21 ` [PATCH v3] " Gabriel Laskar
2 siblings, 2 replies; 6+ messages in thread
From: Gabriel Laskar @ 2015-10-06 14:27 UTC (permalink / raw)
To: Dave Chinner, Ashish Sangwan, Namjae Jeon, Gabriel Laskar,
open list, open list:ABI/API
Cc: Greg Kroah-Hartman
Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr>
---
v2: missed the include of <linux/types.h>
include/linux/falloc.h | 18 ------------------
include/uapi/linux/falloc.h | 20 ++++++++++++++++++++
2 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/include/linux/falloc.h b/include/linux/falloc.h
index 9961110..eb651e9 100644
--- a/include/linux/falloc.h
+++ b/include/linux/falloc.h
@@ -3,24 +3,6 @@
#include <uapi/linux/falloc.h>
-
-/*
- * Space reservation ioctls and argument structure
- * are designed to be compatible with the legacy XFS ioctls.
- */
-struct space_resv {
- __s16 l_type;
- __s16 l_whence;
- __s64 l_start;
- __s64 l_len; /* len == 0 means until end of file */
- __s32 l_sysid;
- __u32 l_pid;
- __s32 l_pad[4]; /* reserved area */
-};
-
-#define FS_IOC_RESVSP _IOW('X', 40, struct space_resv)
-#define FS_IOC_RESVSP64 _IOW('X', 42, struct space_resv)
-
#define FALLOC_FL_SUPPORTED_MASK (FALLOC_FL_KEEP_SIZE | \
FALLOC_FL_PUNCH_HOLE | \
FALLOC_FL_COLLAPSE_RANGE | \
diff --git a/include/uapi/linux/falloc.h b/include/uapi/linux/falloc.h
index 3e445a7..28abee4 100644
--- a/include/uapi/linux/falloc.h
+++ b/include/uapi/linux/falloc.h
@@ -1,6 +1,8 @@
#ifndef _UAPI_FALLOC_H_
#define _UAPI_FALLOC_H_
+#include <linux/types.h>
+
#define FALLOC_FL_KEEP_SIZE 0x01 /* default is extend size */
#define FALLOC_FL_PUNCH_HOLE 0x02 /* de-allocates range */
#define FALLOC_FL_NO_HIDE_STALE 0x04 /* reserved codepoint */
@@ -58,4 +60,22 @@
*/
#define FALLOC_FL_INSERT_RANGE 0x20
+
+/*
+ * Space reservation ioctls and argument structure
+ * are designed to be compatible with the legacy XFS ioctls.
+ */
+struct space_resv {
+ __s16 l_type;
+ __s16 l_whence;
+ __s64 l_start;
+ __s64 l_len; /* len == 0 means until end of file */
+ __s32 l_sysid;
+ __u32 l_pid;
+ __s32 l_pad[4]; /* reserved area */
+};
+
+#define FS_IOC_RESVSP _IOW('X', 40, struct space_resv)
+#define FS_IOC_RESVSP64 _IOW('X', 42, struct space_resv)
+
#endif /* _UAPI_FALLOC_H_ */
--
2.6.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 3/3] falloc: expose ioctl numbers into uapi
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
1 sibling, 0 replies; 6+ messages in thread
From: Yann Droneaud @ 2015-10-06 14:43 UTC (permalink / raw)
To: Gabriel Laskar, Dave Chinner, Ashish Sangwan, Namjae Jeon,
linux-kernel, linux-api
Cc: Greg Kroah-Hartman
Hi,
Le mardi 06 octobre 2015 à 16:27 +0200, Gabriel Laskar a écrit :
> Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr>
> ---
>
> v2: missed the include of <linux/types.h>
>
> include/linux/falloc.h | 18 ------------------
> include/uapi/linux/falloc.h | 20 ++++++++++++++++++++
> 2 files changed, 20 insertions(+), 18 deletions(-)
>
> diff --git a/include/uapi/linux/falloc.h
> b/include/uapi/linux/falloc.h
> index 3e445a7..28abee4 100644
> --- a/include/uapi/linux/falloc.h
> +++ b/include/uapi/linux/falloc.h
> @@ -1,6 +1,8 @@
> #ifndef _UAPI_FALLOC_H_
> #define _UAPI_FALLOC_H_
>
> +#include <linux/types.h>
> +
You should also add #include <linux/ioctl.h> for _IOW() macro
> #define FALLOC_FL_KEEP_SIZE 0x01 /* default is extend size */
> #define FALLOC_FL_PUNCH_HOLE 0x02 /* de-allocates range */
> #define FALLOC_FL_NO_HIDE_STALE 0x04 /* reserved codepoint */
> @@ -58,4 +60,22 @@
> */
> #define FALLOC_FL_INSERT_RANGE 0x20
>
> +
> +/*
> + * Space reservation ioctls and argument structure
> + * are designed to be compatible with the legacy XFS ioctls.
> + */
> +struct space_resv {
> + __s16 l_type;
> + __s16 l_whence;
> + __s64 l_start;
> + __s64 l_len; /* len == 0 means
> until end of file */
> + __s32 l_sysid;
> + __u32 l_pid;
> + __s32 l_pad[4]; /* reserved area */
> +};
> +
> +#define FS_IOC_RESVSP _IOW('X', 40, struct
> space_resv)
> +#define FS_IOC_RESVSP64 _IOW('X', 42, struct
> space_resv)
> +
> #endif /* _UAPI_FALLOC_H_ */
Regards.
--
Yann Droneaud
OPTEYA
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3] falloc: expose ioctl numbers into uapi
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 ` Gabriel Laskar
1 sibling, 0 replies; 6+ messages in thread
From: Gabriel Laskar @ 2015-10-06 16:21 UTC (permalink / raw)
To: Dave Chinner, Gabriel Laskar, Namjae Jeon, Ashish Sangwan,
open list, open list:ABI/API
Signed-off-by: Gabriel Laskar <gabriel@lse.epita.fr>
---
It seems that I am a bit off today, here is hopefully the last version
v2: missed <linux/types.h>
v3: missed <linux/ioctl.h>
include/linux/falloc.h | 18 ------------------
include/uapi/linux/falloc.h | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/include/linux/falloc.h b/include/linux/falloc.h
index 9961110..eb651e9 100644
--- a/include/linux/falloc.h
+++ b/include/linux/falloc.h
@@ -3,24 +3,6 @@
#include <uapi/linux/falloc.h>
-
-/*
- * Space reservation ioctls and argument structure
- * are designed to be compatible with the legacy XFS ioctls.
- */
-struct space_resv {
- __s16 l_type;
- __s16 l_whence;
- __s64 l_start;
- __s64 l_len; /* len == 0 means until end of file */
- __s32 l_sysid;
- __u32 l_pid;
- __s32 l_pad[4]; /* reserved area */
-};
-
-#define FS_IOC_RESVSP _IOW('X', 40, struct space_resv)
-#define FS_IOC_RESVSP64 _IOW('X', 42, struct space_resv)
-
#define FALLOC_FL_SUPPORTED_MASK (FALLOC_FL_KEEP_SIZE | \
FALLOC_FL_PUNCH_HOLE | \
FALLOC_FL_COLLAPSE_RANGE | \
diff --git a/include/uapi/linux/falloc.h b/include/uapi/linux/falloc.h
index 3e445a7..0ae27fe 100644
--- a/include/uapi/linux/falloc.h
+++ b/include/uapi/linux/falloc.h
@@ -1,6 +1,9 @@
#ifndef _UAPI_FALLOC_H_
#define _UAPI_FALLOC_H_
+#include <linux/ioctl.h>
+#include <linux/types.h>
+
#define FALLOC_FL_KEEP_SIZE 0x01 /* default is extend size */
#define FALLOC_FL_PUNCH_HOLE 0x02 /* de-allocates range */
#define FALLOC_FL_NO_HIDE_STALE 0x04 /* reserved codepoint */
@@ -58,4 +61,22 @@
*/
#define FALLOC_FL_INSERT_RANGE 0x20
+
+/*
+ * Space reservation ioctls and argument structure
+ * are designed to be compatible with the legacy XFS ioctls.
+ */
+struct space_resv {
+ __s16 l_type;
+ __s16 l_whence;
+ __s64 l_start;
+ __s64 l_len; /* len == 0 means until end of file */
+ __s32 l_sysid;
+ __u32 l_pid;
+ __s32 l_pad[4]; /* reserved area */
+};
+
+#define FS_IOC_RESVSP _IOW('X', 40, struct space_resv)
+#define FS_IOC_RESVSP64 _IOW('X', 42, struct space_resv)
+
#endif /* _UAPI_FALLOC_H_ */
--
2.6.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [tip:ras/core] x86/mce: Include linux/ioctl.h in uapi mce header
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
0 siblings, 0 replies; 6+ messages in thread
From: tip-bot for Gabriel Laskar @ 2015-10-12 14:30 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, mingo, gabriel, tglx, arnd, hpa, gregkh, bp
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 {
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-10-12 14:31 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[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:ras/core] x86/mce: Include linux/ioctl.h in uapi mce header tip-bot for Gabriel Laskar
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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).