Merge branch 'busybox' into merge

2 files changed, 22 insertions, 0 deletions

diff --git a/include/libbb.h b/include/libbb.h
index 5c4a01e8d..ae10c3bf0 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1345,6 +1345,8 @@ void set_task_comm(const char *comm) FAST_FUNC;
 #endif
 void exit_SUCCESS(void) NORETURN FAST_FUNC;
 void _exit_SUCCESS(void) NORETURN FAST_FUNC;
+void exit_FAILURE(void) NORETURN FAST_FUNC;
+void _exit_FAILURE(void) NORETURN FAST_FUNC;
 
 /* Helpers for daemonization.
  *
@@ -1575,6 +1577,8 @@ int hush_main(int argc, char** argv) IF_SHELL_HUSH(MAIN_EXTERNALLY_VISIBLE);
 /* If shell needs them, they exist even if not enabled as applets */
 int echo_main(int argc, char** argv) IF_ECHO(MAIN_EXTERNALLY_VISIBLE);
 int sleep_main(int argc, char **argv) IF_SLEEP(MAIN_EXTERNALLY_VISIBLE);
+/* See disabled "config ASH_SLEEP" in ash.c */
+#define ENABLE_ASH_SLEEP 0
 int printf_main(int argc, char **argv) IF_PRINTF(MAIN_EXTERNALLY_VISIBLE);
 int test_main(int argc, char **argv)
 #if ENABLE_TEST || ENABLE_TEST1 || ENABLE_TEST2
diff --git a/include/rtc_.h b/include/rtc_.h
index 24ff5363f..782966090 100644
--- a/include/rtc_.h
+++ b/include/rtc_.h
@@ -46,6 +46,17 @@ struct linux_rtc_wkalrm {
         struct linux_rtc_time time;  /* time the alarm is set to */
 };
 
+struct rtc_param {
+        uint64_t param;
+        union {
+                uint64_t uvalue;
+                int64_t svalue;
+                uint64_t ptr;
+        };
+        uint32_t index;
+        uint32_t __pad;
+};
+
 /*
  * ioctl calls that are permitted to the /dev/rtc interface, if
  * any of the RTC drivers are enabled.
@@ -71,12 +82,19 @@ struct linux_rtc_wkalrm {
 #define RTC_WKALM_SET   _IOW('p', 0x0f, struct linux_rtc_wkalrm)/* Set wakeup alarm*/
 #define RTC_WKALM_RD    _IOR('p', 0x10, struct linux_rtc_wkalrm)/* Get wakeup alarm*/
 
+#define RTC_PARAM_GET   _IOW('p', 0x13, struct rtc_param)  /* Get parameter */
+#define RTC_PARAM_SET   _IOW('p', 0x14, struct rtc_param)  /* Set parameter */
+
 /* interrupt flags */
 #define RTC_IRQF 0x80 /* any of the following is active */
 #define RTC_PF 0x40
 #define RTC_AF 0x20
 #define RTC_UF 0x10
 
+#define RTC_PARAM_FEATURES           0
+#define RTC_PARAM_CORRECTION         1
+#define RTC_PARAM_BACKUP_SWITCH_MODE 2
+
 POP_SAVED_FUNCTION_VISIBILITY
 
 #endif