resolved conflicts for merge of 6b8fd054 to master
Change-Id: Ifc5a10d9c2f7764ad80d64cc552aad81d5fbf5eb
This commit is contained in:
commit
8ecb4770a0
@ -47,8 +47,8 @@ uid_t getuid:getuid32 () 199
|
|||||||
gid_t getgid:getgid32 () 200
|
gid_t getgid:getgid32 () 200
|
||||||
uid_t geteuid:geteuid32 () 201
|
uid_t geteuid:geteuid32 () 201
|
||||||
gid_t getegid:getegid32 () 202
|
gid_t getegid:getegid32 () 202
|
||||||
uid_t getresuid:getresuid32 () 209
|
uid_t getresuid:getresuid32 (uid_t *ruid, uid_t *euid, uid_t *suid) 209
|
||||||
gid_t getresgid:getresgid32 () 211
|
gid_t getresgid:getresgid32 (gid_t *rgid, gid_t *egid, gid_t *sgid) 211
|
||||||
pid_t gettid() 224
|
pid_t gettid() 224
|
||||||
ssize_t readahead(int, off64_t, size_t) 225
|
ssize_t readahead(int, off64_t, size_t) 225
|
||||||
int getgroups:getgroups32(int, gid_t *) 205
|
int getgroups:getgroups32(int, gid_t *) 205
|
||||||
|
@ -7,6 +7,12 @@
|
|||||||
.align 4
|
.align 4
|
||||||
|
|
||||||
getresgid:
|
getresgid:
|
||||||
|
pushl %ebx
|
||||||
|
pushl %ecx
|
||||||
|
pushl %edx
|
||||||
|
mov 16(%esp), %ebx
|
||||||
|
mov 20(%esp), %ecx
|
||||||
|
mov 24(%esp), %edx
|
||||||
movl $__NR_getresgid32, %eax
|
movl $__NR_getresgid32, %eax
|
||||||
int $0x80
|
int $0x80
|
||||||
cmpl $-129, %eax
|
cmpl $-129, %eax
|
||||||
@ -17,4 +23,7 @@ getresgid:
|
|||||||
addl $4, %esp
|
addl $4, %esp
|
||||||
orl $-1, %eax
|
orl $-1, %eax
|
||||||
1:
|
1:
|
||||||
|
popl %edx
|
||||||
|
popl %ecx
|
||||||
|
popl %ebx
|
||||||
ret
|
ret
|
||||||
|
@ -7,6 +7,12 @@
|
|||||||
.align 4
|
.align 4
|
||||||
|
|
||||||
getresuid:
|
getresuid:
|
||||||
|
pushl %ebx
|
||||||
|
pushl %ecx
|
||||||
|
pushl %edx
|
||||||
|
mov 16(%esp), %ebx
|
||||||
|
mov 20(%esp), %ecx
|
||||||
|
mov 24(%esp), %edx
|
||||||
movl $__NR_getresuid32, %eax
|
movl $__NR_getresuid32, %eax
|
||||||
int $0x80
|
int $0x80
|
||||||
cmpl $-129, %eax
|
cmpl $-129, %eax
|
||||||
@ -17,4 +23,7 @@ getresuid:
|
|||||||
addl $4, %esp
|
addl $4, %esp
|
||||||
orl $-1, %eax
|
orl $-1, %eax
|
||||||
1:
|
1:
|
||||||
|
popl %edx
|
||||||
|
popl %ecx
|
||||||
|
popl %ebx
|
||||||
ret
|
ret
|
||||||
|
Loading…
x
Reference in New Issue
Block a user