diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-04-08 11:43:30 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-04-08 11:43:30 +0200 |
| commit | 529801898b24544f93532217ce18a7ebbb2b8c4f (patch) | |
| tree | c51c8fd808e6cff15cabb1a9ac29be0661942384 /include/uapi | |
| parent | b847d0501afec4c7b12eb276aec10a2834f953ea (diff) | |
| parent | 23995bbee01d75f09f72b1380bd6045a5b02947b (diff) | |
| download | op-kernel-dev-529801898b24544f93532217ce18a7ebbb2b8c4f.zip op-kernel-dev-529801898b24544f93532217ce18a7ebbb2b8c4f.tar.gz | |
Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/core
Pull IBM zEnterprise EC12 support patchlet from Robert Richter.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/packet_diag.h | 4 | ||||
| -rw-r--r-- | include/uapi/linux/unix_diag.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/uapi/linux/packet_diag.h b/include/uapi/linux/packet_diag.h index 93f5fa9..afafd70 100644 --- a/include/uapi/linux/packet_diag.h +++ b/include/uapi/linux/packet_diag.h @@ -33,9 +33,11 @@ enum { PACKET_DIAG_TX_RING, PACKET_DIAG_FANOUT, - PACKET_DIAG_MAX, + __PACKET_DIAG_MAX, }; +#define PACKET_DIAG_MAX (__PACKET_DIAG_MAX - 1) + struct packet_diag_info { __u32 pdi_index; __u32 pdi_version; diff --git a/include/uapi/linux/unix_diag.h b/include/uapi/linux/unix_diag.h index b8a2494..b9e2a6a 100644 --- a/include/uapi/linux/unix_diag.h +++ b/include/uapi/linux/unix_diag.h @@ -39,9 +39,11 @@ enum { UNIX_DIAG_MEMINFO, UNIX_DIAG_SHUTDOWN, - UNIX_DIAG_MAX, + __UNIX_DIAG_MAX, }; +#define UNIX_DIAG_MAX (__UNIX_DIAG_MAX - 1) + struct unix_diag_vfs { __u32 udiag_vfs_ino; __u32 udiag_vfs_dev; |
