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_write.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_write.h')
| -rw-r--r-- | include/asm-generic/audit_write.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-generic/audit_write.h b/include/asm-generic/audit_write.h index c5f1c2c920e2..e7020c57b13b 100644 --- a/include/asm-generic/audit_write.h +++ b/include/asm-generic/audit_write.h | |||
| @@ -4,7 +4,9 @@ __NR_acct, | |||
| 4 | __NR_swapon, | 4 | __NR_swapon, |
| 5 | #endif | 5 | #endif |
| 6 | __NR_quotactl, | 6 | __NR_quotactl, |
| 7 | #ifdef __NR_truncate | ||
| 7 | __NR_truncate, | 8 | __NR_truncate, |
| 9 | #endif | ||
| 8 | #ifdef __NR_truncate64 | 10 | #ifdef __NR_truncate64 |
| 9 | __NR_truncate64, | 11 | __NR_truncate64, |
| 10 | #endif | 12 | #endif |