generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolved conflicts for merge of defd1622 to gingerbread-plus-aosp

Browse Source 
Conflicts:
	libc/arch-arm/syscalls/eventfd.S
	libc/include/sys/eventfd.h
	libc/include/sys/linux-syscalls.h

Change-Id: I02f6e9536aa5478322240c199ff4c2f4367922d0
This commit is contained in:
repo sync
2010-09-28 12:23:55 +02:00
parent a511f24561 defd162212
commit 686af0b3a5
12 changed files with 136 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libc/arch-arm/syscalls.mk
View File

@@ -172,6 +172,7 @@ syscall_src += arch-arm/syscalls/inotify_init.S
syscall_src += arch-arm/syscalls/inotify_add_watch.S
syscall_src += arch-arm/syscalls/inotify_rm_watch.S
syscall_src += arch-arm/syscalls/poll.S
syscall_src += arch-arm/syscalls/eventfd.S
syscall_src += arch-arm/syscalls/__set_tls.S
syscall_src += arch-arm/syscalls/cacheflush.S
syscall_src += arch-arm/syscalls/eventfd.S

2
libc/arch-arm/syscalls/eventfd.S
View File

@@ -10,7 +10,7 @@
eventfd:
.save {r4, r7}
stmfd sp!, {r4, r7}
ldr r7, =__NR_eventfd
ldr r7, =__NR_eventfd2
swi #0
ldmfd sp!, {r4, r7}
movs r0, r0