diff options
| author | Mark Brown <broonie@linaro.org> | 2014-02-14 12:15:46 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-02-14 12:15:46 +0000 |
| commit | 8415e604452966f981f20cb4d8a8a30e38a772dd (patch) | |
| tree | 0c111cf6c6ed487c9baee37275621097d57f5127 /fs/notify/fanotify/fanotify_user.c | |
| parent | 4b9c8ddadce3ec70fa5d93875adeda861b21c84e (diff) | |
| parent | 29b5f720990fafc302a034468455426dd662e101 (diff) | |
Merge tag 'v3.10.30' into linux-linaro-lskHEADlinux-linaro-lsk-v3.10linux-linaro-lsk
This is the 3.10.30 stable release
Diffstat (limited to 'fs/notify/fanotify/fanotify_user.c')
| -rw-r--r-- | fs/notify/fanotify/fanotify_user.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c index 77cc85dd0db..f1680cdbd88 100644 --- a/fs/notify/fanotify/fanotify_user.c +++ b/fs/notify/fanotify/fanotify_user.c @@ -867,9 +867,9 @@ COMPAT_SYSCALL_DEFINE6(fanotify_mark, { return sys_fanotify_mark(fanotify_fd, flags, #ifdef __BIG_ENDIAN - ((__u64)mask1 << 32) | mask0, -#else ((__u64)mask0 << 32) | mask1, +#else + ((__u64)mask1 << 32) | mask0, #endif dfd, pathname); } |