diff options
| author | James Morris <jmorris@namei.org> | 2012-02-09 01:02:34 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2012-02-09 01:02:34 -0500 |
| commit | 9e3ff38647a316e4f92d59b14c8f0eb13b33bb2c (patch) | |
| tree | 2750d9fc94b8fb78d9982ea4a62d586e7f0a7862 /include/linux/key.h | |
| parent | 2eb6038c51034bf7f9335b15ce9238a028fdd2d6 (diff) | |
| parent | 4c2c392763a682354fac65b6a569adec4e4b5387 (diff) | |
Merge branch 'next-queue' into next
Diffstat (limited to 'include/linux/key.h')
| -rw-r--r-- | include/linux/key.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/key.h b/include/linux/key.h index 5253471cd2ea..1600ebf717a7 100644 --- a/include/linux/key.h +++ b/include/linux/key.h | |||
| @@ -155,6 +155,7 @@ struct key { | |||
| 155 | #define KEY_FLAG_IN_QUOTA 3 /* set if key consumes quota */ | 155 | #define KEY_FLAG_IN_QUOTA 3 /* set if key consumes quota */ |
| 156 | #define KEY_FLAG_USER_CONSTRUCT 4 /* set if key is being constructed in userspace */ | 156 | #define KEY_FLAG_USER_CONSTRUCT 4 /* set if key is being constructed in userspace */ |
| 157 | #define KEY_FLAG_NEGATIVE 5 /* set if key is negative */ | 157 | #define KEY_FLAG_NEGATIVE 5 /* set if key is negative */ |
| 158 | #define KEY_FLAG_ROOT_CAN_CLEAR 6 /* set if key can be cleared by root without permission */ | ||
| 158 | 159 | ||
| 159 | /* the description string | 160 | /* the description string |
| 160 | * - this is used to match a key against search criteria | 161 | * - this is used to match a key against search criteria |