Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 520acaf in mainline for kernel/generic/src/ipc/sysipc.c


Ignore:
Timestamp:
2012-06-06T21:13:29Z (10 years ago)
Author:
Sean Bartell <wingedtachikoma@…>
Branches:
lfn, master
Children:
5f679702
Parents:
11b9ad7 (diff), 3123d2a (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:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/ipc/sysipc.c

    r11b9ad7 r520acaf  
    597597        if (IPC_GET_IMETHOD(call->data) == IPC_M_CONNECT_TO_ME) {
    598598                int phoneid = phone_alloc(TASK);
    599                 if (phoneid < 0) { /* Failed to allocate phone */
     599                if (phoneid < 0) {  /* Failed to allocate phone */
    600600                        IPC_SET_RETVAL(call->data, ELIMIT);
    601601                        ipc_answer(box, call);
     
    883883       
    884884        /*
    885          * Userspace is not allowed to change interface and method of system
     885         * User space is not allowed to change interface and method of system
    886886         * methods on forward, allow changing ARG1, ARG2, ARG3 and ARG4 by
    887          * means of method, arg1, arg2 and arg3.
     887         * means of imethod, arg1, arg2 and arg3.
    888888         * If the interface and method is immutable, don't change anything.
    889889         */
     
    897897                        IPC_SET_ARG3(call->data, arg2);
    898898                       
    899                         if (slow) {
     899                        if (slow)
    900900                                IPC_SET_ARG4(call->data, arg3);
    901                                 /*
    902                                  * For system methods we deliberately don't
    903                                  * overwrite ARG5.
    904                                  */
    905                         }
     901                       
     902                        /*
     903                         * For system methods we deliberately don't
     904                         * overwrite ARG5.
     905                         */
    906906                } else {
    907907                        IPC_SET_IMETHOD(call->data, imethod);
Note: See TracChangeset for help on using the changeset viewer.