[PATCH 01/24] kernel: define taststats commands in the one place
From: Andrey Vagin <hidden>
Date: 2015-07-06 08:56:58
Also in:
lkml
Subsystem:
the rest · Maintainer:
Linus Torvalds
Currently if we add a new TASKSTATS_ constant, we will chanage all CGROUPSTATS_ contants and break backward compatibility. Signed-off-by: Andrey Vagin <redacted> --- include/uapi/linux/cgroupstats.h | 15 --------------- include/uapi/linux/taskstats.h | 7 +++++++ 2 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/include/uapi/linux/cgroupstats.h b/include/uapi/linux/cgroupstats.h
index 3753c33..8095931 100644
--- a/include/uapi/linux/cgroupstats.h
+++ b/include/uapi/linux/cgroupstats.h@@ -37,21 +37,6 @@ struct cgroupstats { __u64 nr_io_wait; /* Number of tasks waiting on IO */ }; -/* - * Commands sent from userspace - * Not versioned. New commands should only be inserted at the enum's end - * prior to __CGROUPSTATS_CMD_MAX - */ - -enum { - CGROUPSTATS_CMD_UNSPEC = __TASKSTATS_CMD_MAX, /* Reserved */ - CGROUPSTATS_CMD_GET, /* user->kernel request/get-response */ - CGROUPSTATS_CMD_NEW, /* kernel->user event */ - __CGROUPSTATS_CMD_MAX, -}; - -#define CGROUPSTATS_CMD_MAX (__CGROUPSTATS_CMD_MAX - 1) - enum { CGROUPSTATS_TYPE_UNSPEC = 0, /* Reserved */ CGROUPSTATS_TYPE_CGROUP_STATS, /* contains name + stats */
diff --git a/include/uapi/linux/taskstats.h b/include/uapi/linux/taskstats.h
index 2466e55..a1cc91b 100644
--- a/include/uapi/linux/taskstats.h
+++ b/include/uapi/linux/taskstats.h@@ -176,9 +176,16 @@ enum { TASKSTATS_CMD_UNSPEC = 0, /* Reserved */ TASKSTATS_CMD_GET, /* user->kernel request/get-response */ TASKSTATS_CMD_NEW, /* kernel->user event */ + __TASKSTATS_CMD_RESERVED, + + CGROUPSTATS_CMD_GET, /* user->kernel request/get-response */ + CGROUPSTATS_CMD_NEW, /* kernel->user event */ + __TASKSTATS_CMD_MAX, }; +#define __CGROUPSTATS_CMD_MAX __TASKSTATS_CMD_MAX +#define CGROUPSTATS_CMD_MAX (__CGROUPSTATS_CMD_MAX - 1) #define TASKSTATS_CMD_MAX (__TASKSTATS_CMD_MAX - 1) enum {
--
2.1.0