diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /include/asm-generic/audit_change_attr.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'include/asm-generic/audit_change_attr.h')
| -rw-r--r-- | include/asm-generic/audit_change_attr.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/asm-generic/audit_change_attr.h b/include/asm-generic/audit_change_attr.h index 50764550a60c..89b73e5d0fd0 100644 --- a/include/asm-generic/audit_change_attr.h +++ b/include/asm-generic/audit_change_attr.h | |||
| @@ -1,4 +1,6 @@ | |||
| 1 | #ifdef __NR_chmod | ||
| 1 | __NR_chmod, | 2 | __NR_chmod, |
| 3 | #endif | ||
| 2 | __NR_fchmod, | 4 | __NR_fchmod, |
| 3 | #ifdef __NR_chown | 5 | #ifdef __NR_chown |
| 4 | __NR_chown, | 6 | __NR_chown, |
| @@ -20,3 +22,9 @@ __NR_chown32, | |||
| 20 | __NR_fchown32, | 22 | __NR_fchown32, |
| 21 | __NR_lchown32, | 23 | __NR_lchown32, |
| 22 | #endif | 24 | #endif |
| 25 | #ifdef __NR_link | ||
| 26 | __NR_link, | ||
| 27 | #endif | ||
| 28 | #ifdef __NR_linkat | ||
| 29 | __NR_linkat, | ||
| 30 | #endif | ||