Changeset e1dbcbc in mainline for kernel/generic/src

Timestamp:

2011-04-29T13:43:01Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a81a1d09

Parents:

380e0364 (diff), f19f1b7 (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 development/ changes

Location:

kernel/generic/src

Files:

• ipc/sysipc.c (modified) (2 diffs)
• main/main.c (modified) (2 diffs)

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();