FMODE_NONOTIFY=0x800000 collides with __O_SYNC in sparc, so change it to 0x1000000. CC: Eric Paris Signed-off-by: Wu Fengguang --- include/asm-generic/fcntl.h | 2 +- include/linux/fs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- linux.orig/include/asm-generic/fcntl.h 2010-01-05 10:42:36.000000000 +0800 +++ linux/include/asm-generic/fcntl.h 2010-01-05 10:42:57.000000000 +0800 @@ -5,7 +5,7 @@ /* * FMODE_EXEC is 0x20 - * FMODE_NONOTIFY is 0x800000 + * FMODE_NONOTIFY is 0x1000000 * These cannot be used by userspace O_* until internal and external open * flags are split. * -Eric Paris --- linux.orig/include/linux/fs.h 2010-01-05 10:40:33.000000000 +0800 +++ linux/include/linux/fs.h 2010-01-05 10:42:07.000000000 +0800 @@ -88,7 +88,7 @@ struct inodes_stat_t { #define FMODE_NOCMTIME ((__force fmode_t)2048) /* File was opened by fanotify and shouldn't generate fanotify events */ -#define FMODE_NONOTIFY ((__force fmode_t)8388608) +#define FMODE_NONOTIFY ((__force fmode_t)0x1000000) /* * The below are the various read and write types that we support. Some of -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/