Changeset f2b3d3e in mainline for kernel/generic

Timestamp:

2012-05-04T10:57:48Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

35a35651

Parents:

90924df (diff), d21e935c (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

Location:

kernel/generic/src

Files:

• console/console.c (modified) (1 diff)
• ipc/sysipc.c (modified) (4 diffs)
• printf/printf_core.c (modified) (2 diffs)

kernel/generic/src/console/console.c

@@ -57 +57 @@
 
 /** Kernel log cyclic buffer */
-static wchar_t klog[KLOG_LENGTH] __attribute__ ((aligned (PAGE_SIZE)));
+wchar_t klog[KLOG_LENGTH] __attribute__((aligned(PAGE_SIZE)));
 
 /** Kernel log initialized */

kernel/generic/src/ipc/sysipc.c

@@ -111 +111 @@
         switch (imethod) {
         case IPC_M_CONNECTION_CLONE:
-        case IPC_M_CONNECT_ME:
+        case IPC_M_CLONE_ESTABLISH:
         case IPC_M_PHONE_HUNGUP:
                 /* This message is meant only for the original recipient. */
@@ -160 +160 @@
         switch (IPC_GET_IMETHOD(call->data)) {
         case IPC_M_CONNECTION_CLONE:
-        case IPC_M_CONNECT_ME:
+        case IPC_M_CLONE_ESTABLISH:
         case IPC_M_CONNECT_TO_ME:
         case IPC_M_CONNECT_ME_TO:
@@ -225 +225 @@
                         mutex_unlock(&phone->lock);
                 }
-        } else if (IPC_GET_IMETHOD(*olddata) == IPC_M_CONNECT_ME) {
+        } else if (IPC_GET_IMETHOD(*olddata) == IPC_M_CLONE_ESTABLISH) {
                 phone_t *phone = (phone_t *) IPC_GET_ARG5(*olddata);
                 
@@ -459 +459 @@
                 break;
         }
-        case IPC_M_CONNECT_ME:
+        case IPC_M_CLONE_ESTABLISH:
                 IPC_SET_ARG5(call->data, (sysarg_t) phone);
                 break;

kernel/generic/src/printf/printf_core.c

@@ -284 +284 @@
         /* Print leading spaces. */
         size_t strw = str_length(str);
-        if (precision == 0)
+        if ((precision == 0) || (precision > strw))
                 precision = strw;
         
@@ -332 +332 @@
         /* Print leading spaces. */
         size_t strw = wstr_length(str);
-        if (precision == 0)
+        if ((precision == 0) || (precision > strw))
                 precision = strw;