diff options
| author | John Stultz <john.stultz@linaro.org> | 2014-01-02 20:11:06 -0800 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2014-01-02 20:11:06 -0800 |
| commit | 3de283fd5a5a1db9ea3d97da3825cddcedc9a9bb (patch) | |
| tree | 1d5b6f3cb2d412782050d5e64f8e290a93ae3515 /fs | |
| parent | c240c24f343f6e2b919bdfc1ee4f1d2ba6b07d79 (diff) | |
| parent | 0715d10b9e6c04327adb189e13ecd6a3c2df48ce (diff) | |
Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/timerfd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/timerfd.c b/fs/timerfd.c index 929312180dd..0013142c047 100644 --- a/fs/timerfd.c +++ b/fs/timerfd.c @@ -317,6 +317,7 @@ SYSCALL_DEFINE2(timerfd_create, int, clockid, int, flags) (clockid != CLOCK_MONOTONIC && clockid != CLOCK_REALTIME && clockid != CLOCK_REALTIME_ALARM && + clockid != CLOCK_BOOTTIME && clockid != CLOCK_BOOTTIME_ALARM)) return -EINVAL; |