Changeset 132ab5d1 in mainline for kernel/generic/src/console/cmd.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• kernel/generic/src/console/cmd.c (modified) (4 diffs)

kernel/generic/src/console/cmd.c

@@ -497 +497 @@
 };
 
-static int cmd_slabs(cmd_arg_t *argv);
-static cmd_info_t slabs_info = {
-        .name = "slabs",
+static int cmd_caches(cmd_arg_t *argv);
+static cmd_info_t caches_info = {
+        .name = "caches",
         .description = "List slab caches.",
-        .func = cmd_slabs,
+        .func = cmd_caches,
         .argc = 0
 };
@@ -605 +605 @@
         &call0_info,
         &mcall0_info,
+        &caches_info,
         &call1_info,
         &call2_info,
@@ -620 +621 @@
         &sched_info,
         &set4_info,
-        &slabs_info,
         &symaddr_info,
         &sysinfo_info,
@@ -1214 +1214 @@
 }
 
-/** Command for listings SLAB caches
- *
- * @param argv Ignores
+/** Command for listing slab allocator caches
+ *
+ * @param argv Ignored
  *
  * @return Always 1
  */
-int cmd_slabs(cmd_arg_t *argv)
+int cmd_caches(cmd_arg_t *argv)
 {
         slab_print_list();