Changeset 0773396 in mainline for kernel/generic/src/console/kconsole.c

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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 mainline changes

File:

• kernel/generic/src/console/kconsole.c (modified) (3 diffs)

kernel/generic/src/console/kconsole.c

@@ -53 +53 @@
 #include <func.h>
 #include <str.h>
-#include <macros.h>
 #include <sysinfo/sysinfo.h>
 #include <ddi/device.h>
@@ -119 +118 @@
          * Make sure the command is not already listed.
          */
-        list_foreach(cmd_list, cur) {
-                cmd_info_t *hlp = list_get_instance(cur, cmd_info_t, link);
-                
+        list_foreach(cmd_list, link, cmd_info_t, hlp) {
                 if (hlp == cmd) {
                         /* The command is already there. */
@@ -613 +610 @@
         cmd_info_t *cmd = NULL;
         
-        list_foreach(cmd_list, cur) {
-                cmd_info_t *hlp = list_get_instance(cur, cmd_info_t, link);
+        list_foreach(cmd_list, link, cmd_info_t, hlp) {
                 spinlock_lock(&hlp->lock);