From f843972b5d47df789194d9b1c51d52660e297d33 Mon Sep 17 00:00:00 2001 From: David Howells Date: Tue, 29 Apr 2008 20:54:28 +0100 Subject: [PATCH] --- yaml --- r: 94887 b: refs/heads/master c: 25f2ea9fc8c7ec34d351cef7dade2e8046e49ed1 h: refs/heads/master i: 94885: 3d282b86c083e3f8521790a9ce6fa806da548354 94883: 1d1f9f21cab93fe89cb3cf25810907fa78553871 94879: a293a19e5e61f585095a2468eb734a60c04d4c2f v: v3 --- [refs] | 2 +- trunk/include/linux/capability.h | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 26bb0230757b..97350c3d3d58 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7bf570dc8dcf76df2a9f583bef2da96d4289ed0d +refs/heads/master: 25f2ea9fc8c7ec34d351cef7dade2e8046e49ed1 diff --git a/trunk/include/linux/capability.h b/trunk/include/linux/capability.h index eaab759b1460..f4ea0dd9a618 100644 --- a/trunk/include/linux/capability.h +++ b/trunk/include/linux/capability.h @@ -365,12 +365,12 @@ typedef struct kernel_cap_struct { # error Fix up hand-coded capability macro initializers #else /* HAND-CODED capability initializers */ -# define CAP_EMPTY_SET {{ 0, 0 }} -# define CAP_FULL_SET {{ ~0, ~0 }} -# define CAP_INIT_EFF_SET {{ ~CAP_TO_MASK(CAP_SETPCAP), ~0 }} -# define CAP_FS_SET {{ CAP_FS_MASK_B0, CAP_FS_MASK_B1 } } -# define CAP_NFSD_SET {{ CAP_FS_MASK_B0|CAP_TO_MASK(CAP_SYS_RESOURCE), \ - CAP_FS_MASK_B1 } } +# define CAP_EMPTY_SET ((kernel_cap_t){{ 0, 0 }}) +# define CAP_FULL_SET ((kernel_cap_t){{ ~0, ~0 }}) +# define CAP_INIT_EFF_SET ((kernel_cap_t){{ ~CAP_TO_MASK(CAP_SETPCAP), ~0 }}) +# define CAP_FS_SET ((kernel_cap_t){{ CAP_FS_MASK_B0, CAP_FS_MASK_B1 } }) +# define CAP_NFSD_SET ((kernel_cap_t){{ CAP_FS_MASK_B0|CAP_TO_MASK(CAP_SYS_RESOURCE), \ + CAP_FS_MASK_B1 } }) #endif /* _LINUX_CAPABILITY_U32S != 2 */