Changeset b77ce84 in mainline for kernel

Timestamp:

2011-04-13T17:27:52Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

34e8bab, a0a134b

Parents:

8b4ce802 (diff), 17279ead (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

Files:

• Makefile (modified) (2 diffs)
• arch/mips32/include/atomic.h (modified) (1 diff)
• generic/include/ipc/ipc.h (modified) (1 diff)
• generic/include/proc/tasklet.h (deleted)
• generic/src/ipc/sysipc.c (modified) (2 diffs)
• generic/src/main/main.c (modified) (2 diffs)
• generic/src/proc/tasklet.c (deleted)

kernel/Makefile

@@ -226 +226 @@
         generic/src/proc/task.c \
         generic/src/proc/the.c \
-        generic/src/proc/tasklet.c \
         generic/src/syscall/syscall.c \
         generic/src/syscall/copy.c \
@@ -382 +381 @@
                 generic/src/main/kinit.c \
                 generic/src/proc/the.c \
-                generic/src/proc/tasklet.c \
                 generic/src/mm/frame.c \
                 generic/src/mm/page.c \

kernel/arch/mips32/include/atomic.h

@@ -91 +91 @@
                 "       sc %0, %1\n"
                 "       beqz %0, 1b\n"
+                "       nop\n"
                 "2:\n"
                 : "=&r" (tmp),

kernel/generic/include/ipc/ipc.h

@@ -115 +115 @@
  */
 #define IPC_FF_ROUTE_FROM_ME  (1 << 0)
+
+/* Data transfer flags. */
+#define IPC_XF_NONE             0
+
+/** Restrict the transfer size if necessary. */
+#define IPC_XF_RESTRICT         (1 << 0)
 
 /** Kernel IPC interfaces

kernel/generic/src/ipc/sysipc.c

@@ -426 +426 @@
         case IPC_M_DATA_READ: {
                 size_t size = IPC_GET_ARG2(call->data);
-                if ((size <= 0 || (size > DATA_XFER_LIMIT)))
+                if (size <= 0)
                         return ELIMIT;
-                
+                if (size > DATA_XFER_LIMIT) {
+                        int flags = IPC_GET_ARG3(call->data);
+                        if (flags & IPC_XF_RESTRICT)
+                                IPC_SET_ARG2(call->data, DATA_XFER_LIMIT);
+                        else
+                                return ELIMIT;
+                }
                 break;
         }
@@ -435 +441 @@
                 size_t size = IPC_GET_ARG2(call->data);
                 
-                if (size > DATA_XFER_LIMIT)
-                        return ELIMIT;
+                if (size > DATA_XFER_LIMIT) {
+                        int flags = IPC_GET_ARG3(call->data);
+                        if (flags & IPC_XF_RESTRICT) {
+                                size = DATA_XFER_LIMIT;
+                                IPC_SET_ARG2(call->data, size);
+                        } else
+                                return ELIMIT;
+                }
                 
                 call->buffer = (uint8_t *) malloc(size, 0);

kernel/generic/src/main/main.c

@@ -58 +58 @@
 #include <proc/thread.h>
 #include <proc/task.h>
-#include <proc/tasklet.h>
 #include <main/kinit.h>
 #include <main/version.h>
@@ -217 +216 @@
         tlb_init();
         ddi_init();
-        tasklet_init();
         arch_post_mm_init();
         arch_pre_smp_init();