Revision c05c7a73

b/configure
1629 1629
  inotify=yes
1630 1630
fi
1631 1631

  
1632
inotify1=no
1633
cat > $TMPC << EOF
1634
#include <sys/inotify.h>
1635

  
1636
int
1637
main(void)
1638
{
1639
    /* try to start inotify */
1640
    return inotify_init1(0);
1641
}
1642
EOF
1643
if compile_prog "" "" ; then
1644
  inotify1=yes
1645
fi
1646

  
1632 1647
# check if utimensat and futimens are supported
1633 1648
utimens=no
1634 1649
cat > $TMPC << EOF
......
2136 2151
if test "$inotify" = "yes" ; then
2137 2152
  echo "CONFIG_INOTIFY=y" >> $config_host_mak
2138 2153
fi
2154
if test "$inotify1" = "yes" ; then
2155
  echo "CONFIG_INOTIFY1=y" >> $config_host_mak
2156
fi
2139 2157
if test "$byteswap_h" = "yes" ; then
2140 2158
  echo "CONFIG_BYTESWAP_H=y" >> $config_host_mak
2141 2159
fi
b/linux-user/syscall.c
506 506
  return (inotify_rm_watch(fd, wd));
507 507
}
508 508
#endif
509
#ifdef CONFIG_INOTIFY1
510
#if defined(TARGET_NR_inotify_init1) && defined(__NR_inotify_init1)
511
static int sys_inotify_init1(int flags)
512
{
513
  return (inotify_init1(flags));
514
}
515
#endif
516
#endif
509 517
#else
510 518
/* Userspace can usually survive runtime without inotify */
511 519
#undef TARGET_NR_inotify_init
520
#undef TARGET_NR_inotify_init1
512 521
#undef TARGET_NR_inotify_add_watch
513 522
#undef TARGET_NR_inotify_rm_watch
514 523
#endif /* CONFIG_INOTIFY  */
......
7055 7064
        ret = get_errno(sys_inotify_init());
7056 7065
        break;
7057 7066
#endif
7067
#if defined(TARGET_NR_inotify_init1) && defined(__NR_inotify_init1)
7068
    case TARGET_NR_inotify_init1:
7069
        ret = get_errno(sys_inotify_init1(arg1));
7070
        break;
7071
#endif
7058 7072
#if defined(TARGET_NR_inotify_add_watch) && defined(__NR_inotify_add_watch)
7059 7073
    case TARGET_NR_inotify_add_watch:
7060 7074
        p = lock_user_string(arg2);

Also available in: Unified diff