Changeset bd5f3b7 in mainline for kernel/generic/src/console/console.c

Timestamp:

2011-08-21T13:07:35Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

00aece0, f1a9e87

Parents:

86a34d3e (diff), a6480d5 (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/console.c (modified) (3 diffs)

kernel/generic/src/console/console.c

@@ -248 +248 @@
 }
 
-void klog_update(void)
+void klog_update(void *event)
 {
         if (!atomic_get(&klog_inited))
@@ -327 +327 @@
         /* Force notification on newline */
         if (ch == '\n')
-                klog_update();
+                klog_update(NULL);
 }
 
@@ -358 +358 @@
                 free(data);
         } else
-                klog_update();
+                klog_update(NULL);
         
         return size;