Merge commit 'b83c9704128dd106071184e4b00335a3b8486857' into merge

1 files changed, 12 insertions, 0 deletions

diff --git a/shell/shell_common.c b/shell/shell_common.c
index c7b5b6122..75f4b3e54 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -286,6 +286,12 @@ static const struct limits limits_tbl[] = {
 #ifdef RLIMIT_LOCKS
         { RLIMIT_LOCKS,         0,      'w',    "locks" },
 #endif
+#ifdef RLIMIT_NICE
+        { RLIMIT_NICE,          0,      'e',    "scheduling priority" },
+#endif
+#ifdef RLIMIT_RTPRIO
+        { RLIMIT_RTPRIO,        0,      'r',    "real-time priority" },
+#endif
 };
 
 enum {
@@ -328,6 +334,12 @@ static const char ulimit_opt_string[] = "-HSa"
 #ifdef RLIMIT_LOCKS
                         "w::"
 #endif
+#ifdef RLIMIT_NICE
+                        "e::"
+#endif
+#ifdef RLIMIT_RTPRIO
+                        "r::"
+#endif
                         ;
 
 #if ENABLE_PLATFORM_MINGW32