2 files changed, 11 insertions, 0 deletions

diff --git a/include/applets.h b/include/applets.h
index 2d784bd84..83c1792ac 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -161,6 +161,7 @@ IF_FLASH_ERASEALL(APPLET(flash_eraseall, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
 IF_FLASH_LOCK(APPLET_ODDNAME(flash_lock, flash_lock_unlock, _BB_DIR_USR_SBIN, _BB_SUID_DROP, flash_lock))
 IF_FLASH_UNLOCK(APPLET_ODDNAME(flash_unlock, flash_lock_unlock, _BB_DIR_USR_SBIN, _BB_SUID_DROP, flash_unlock))
 IF_FLASHCP(APPLET(flashcp, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
+IF_FLOCK(APPLET(flock, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_FOLD(APPLET(fold, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_FREE(APPLET(free, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_FREERAMDISK(APPLET(freeramdisk, _BB_DIR_SBIN, _BB_SUID_DROP))
diff --git a/include/usage.h b/include/usage.h
index f4259a11d..0aea010c7 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -1312,6 +1312,16 @@
      "\nOptions:" \
      "\n        -v      Verbose" \
 
+#define flock_trivial_usage \
+       "[-sxun] FD|FILE [[-c] PROG ARGS]"
+#define flock_full_usage "\n\n" \
+       "[Un]lock file descriptor or file, then run PROG\n" \
+     "\nOptions:" \
+     "\n        -s      Shared lock" \
+     "\n        -x      Exclusive lock (default)" \
+     "\n        -u      Remove a lock from FD" \
+     "\n        -n      Fail rather than wait" \
+
 #define fold_trivial_usage \
        "[-bs] [-w WIDTH] [FILE]..."
 #define fold_full_usage "\n\n" \