resolved conflicts for merge of 1dbf56aa to klp-dev-plus-aosp
Change-Id: Ia1d1467065320941d6dc3a50f7ea85eb4dbf3841
This commit is contained in:
@@ -35,15 +35,12 @@ syscall_src += arch-arm/syscalls/__waitid.S
|
||||
syscall_src += arch-arm/syscalls/_exit.S
|
||||
syscall_src += arch-arm/syscalls/_exit_thread.S
|
||||
syscall_src += arch-arm/syscalls/accept.S
|
||||
syscall_src += arch-arm/syscalls/access.S
|
||||
syscall_src += arch-arm/syscalls/acct.S
|
||||
syscall_src += arch-arm/syscalls/bind.S
|
||||
syscall_src += arch-arm/syscalls/cacheflush.S
|
||||
syscall_src += arch-arm/syscalls/capget.S
|
||||
syscall_src += arch-arm/syscalls/capset.S
|
||||
syscall_src += arch-arm/syscalls/chdir.S
|
||||
syscall_src += arch-arm/syscalls/chmod.S
|
||||
syscall_src += arch-arm/syscalls/chown.S
|
||||
syscall_src += arch-arm/syscalls/chroot.S
|
||||
syscall_src += arch-arm/syscalls/clock_getres.S
|
||||
syscall_src += arch-arm/syscalls/clock_gettime.S
|
||||
@@ -105,21 +102,18 @@ syscall_src += arch-arm/syscalls/inotify_rm_watch.S
|
||||
syscall_src += arch-arm/syscalls/ioprio_get.S
|
||||
syscall_src += arch-arm/syscalls/ioprio_set.S
|
||||
syscall_src += arch-arm/syscalls/klogctl.S
|
||||
syscall_src += arch-arm/syscalls/lchown.S
|
||||
syscall_src += arch-arm/syscalls/lgetxattr.S
|
||||
syscall_src += arch-arm/syscalls/link.S
|
||||
syscall_src += arch-arm/syscalls/linkat.S
|
||||
syscall_src += arch-arm/syscalls/listen.S
|
||||
syscall_src += arch-arm/syscalls/listxattr.S
|
||||
syscall_src += arch-arm/syscalls/llistxattr.S
|
||||
syscall_src += arch-arm/syscalls/lremovexattr.S
|
||||
syscall_src += arch-arm/syscalls/lseek.S
|
||||
syscall_src += arch-arm/syscalls/lsetxattr.S
|
||||
syscall_src += arch-arm/syscalls/lstat.S
|
||||
syscall_src += arch-arm/syscalls/madvise.S
|
||||
syscall_src += arch-arm/syscalls/mincore.S
|
||||
syscall_src += arch-arm/syscalls/mkdir.S
|
||||
syscall_src += arch-arm/syscalls/mkdirat.S
|
||||
syscall_src += arch-arm/syscalls/mknod.S
|
||||
syscall_src += arch-arm/syscalls/mknodat.S
|
||||
syscall_src += arch-arm/syscalls/mlock.S
|
||||
syscall_src += arch-arm/syscalls/mlockall.S
|
||||
syscall_src += arch-arm/syscalls/mount.S
|
||||
@@ -141,14 +135,12 @@ syscall_src += arch-arm/syscalls/pread64.S
|
||||
syscall_src += arch-arm/syscalls/pwrite64.S
|
||||
syscall_src += arch-arm/syscalls/read.S
|
||||
syscall_src += arch-arm/syscalls/readahead.S
|
||||
syscall_src += arch-arm/syscalls/readlink.S
|
||||
syscall_src += arch-arm/syscalls/readlinkat.S
|
||||
syscall_src += arch-arm/syscalls/readv.S
|
||||
syscall_src += arch-arm/syscalls/recvfrom.S
|
||||
syscall_src += arch-arm/syscalls/recvmsg.S
|
||||
syscall_src += arch-arm/syscalls/removexattr.S
|
||||
syscall_src += arch-arm/syscalls/rename.S
|
||||
syscall_src += arch-arm/syscalls/renameat.S
|
||||
syscall_src += arch-arm/syscalls/rmdir.S
|
||||
syscall_src += arch-arm/syscalls/sched_get_priority_max.S
|
||||
syscall_src += arch-arm/syscalls/sched_get_priority_min.S
|
||||
syscall_src += arch-arm/syscalls/sched_getparam.S
|
||||
@@ -183,10 +175,9 @@ syscall_src += arch-arm/syscalls/sigaltstack.S
|
||||
syscall_src += arch-arm/syscalls/signalfd4.S
|
||||
syscall_src += arch-arm/syscalls/socket.S
|
||||
syscall_src += arch-arm/syscalls/socketpair.S
|
||||
syscall_src += arch-arm/syscalls/stat.S
|
||||
syscall_src += arch-arm/syscalls/swapoff.S
|
||||
syscall_src += arch-arm/syscalls/swapon.S
|
||||
syscall_src += arch-arm/syscalls/symlink.S
|
||||
syscall_src += arch-arm/syscalls/symlinkat.S
|
||||
syscall_src += arch-arm/syscalls/sync.S
|
||||
syscall_src += arch-arm/syscalls/sysinfo.S
|
||||
syscall_src += arch-arm/syscalls/timerfd_create.S
|
||||
@@ -198,11 +189,9 @@ syscall_src += arch-arm/syscalls/truncate64.S
|
||||
syscall_src += arch-arm/syscalls/umask.S
|
||||
syscall_src += arch-arm/syscalls/umount2.S
|
||||
syscall_src += arch-arm/syscalls/uname.S
|
||||
syscall_src += arch-arm/syscalls/unlink.S
|
||||
syscall_src += arch-arm/syscalls/unlinkat.S
|
||||
syscall_src += arch-arm/syscalls/unshare.S
|
||||
syscall_src += arch-arm/syscalls/utimensat.S
|
||||
syscall_src += arch-arm/syscalls/utimes.S
|
||||
syscall_src += arch-arm/syscalls/vfork.S
|
||||
syscall_src += arch-arm/syscalls/wait4.S
|
||||
syscall_src += arch-arm/syscalls/write.S
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
/* Generated by gensyscalls.py. Do not edit. */
|
||||
|
||||
#include <asm/unistd.h>
|
||||
#include <linux/err.h>
|
||||
#include <machine/asm.h>
|
||||
|
||||
ENTRY(link)
|
||||
mov ip, r7
|
||||
ldr r7, =__NR_link
|
||||
swi #0
|
||||
mov r7, ip
|
||||
cmn r0, #(MAX_ERRNO + 1)
|
||||
bxls lr
|
||||
neg r0, r0
|
||||
b __set_errno
|
||||
END(link)
|
||||
@@ -4,13 +4,16 @@
|
||||
#include <linux/err.h>
|
||||
#include <machine/asm.h>
|
||||
|
||||
ENTRY(lchown)
|
||||
mov ip, r7
|
||||
ldr r7, =__NR_lchown32
|
||||
ENTRY(linkat)
|
||||
mov ip, sp
|
||||
.save {r4, r5, r6, r7}
|
||||
stmfd sp!, {r4, r5, r6, r7}
|
||||
ldmfd ip, {r4, r5, r6}
|
||||
ldr r7, =__NR_linkat
|
||||
swi #0
|
||||
mov r7, ip
|
||||
ldmfd sp!, {r4, r5, r6, r7}
|
||||
cmn r0, #(MAX_ERRNO + 1)
|
||||
bxls lr
|
||||
neg r0, r0
|
||||
b __set_errno
|
||||
END(lchown)
|
||||
END(linkat)
|
||||
@@ -1,16 +0,0 @@
|
||||
/* Generated by gensyscalls.py. Do not edit. */
|
||||
|
||||
#include <asm/unistd.h>
|
||||
#include <linux/err.h>
|
||||
#include <machine/asm.h>
|
||||
|
||||
ENTRY(lstat)
|
||||
mov ip, r7
|
||||
ldr r7, =__NR_lstat64
|
||||
swi #0
|
||||
mov r7, ip
|
||||
cmn r0, #(MAX_ERRNO + 1)
|
||||
bxls lr
|
||||
neg r0, r0
|
||||
b __set_errno
|
||||
END(lstat)
|
||||
@@ -1,16 +0,0 @@
|
||||
/* Generated by gensyscalls.py. Do not edit. */
|
||||
|
||||
#include <asm/unistd.h>
|
||||
#include <linux/err.h>
|
||||
#include <machine/asm.h>
|
||||
|
||||
ENTRY(mkdir)
|
||||
mov ip, r7
|
||||
ldr r7, =__NR_mkdir
|
||||
swi #0
|
||||
mov r7, ip
|
||||
cmn r0, #(MAX_ERRNO + 1)
|
||||
bxls lr
|
||||
neg r0, r0
|
||||
b __set_errno
|
||||
END(mkdir)
|
||||
@@ -1,16 +0,0 @@
|
||||
/* Generated by gensyscalls.py. Do not edit. */
|
||||
|
||||
#include <asm/unistd.h>
|
||||
#include <linux/err.h>
|
||||
#include <machine/asm.h>
|
||||
|
||||
ENTRY(mknod)
|
||||
mov ip, r7
|
||||
ldr r7, =__NR_mknod
|
||||
swi #0
|
||||
mov r7, ip
|
||||
cmn r0, #(MAX_ERRNO + 1)
|
||||
bxls lr
|
||||
neg r0, r0
|
||||
b __set_errno
|
||||
END(mknod)
|
||||
@@ -4,13 +4,13 @@
|
||||
#include <linux/err.h>
|
||||
#include <machine/asm.h>
|
||||
|
||||
ENTRY(access)
|
||||
ENTRY(mknodat)
|
||||
mov ip, r7
|
||||
ldr r7, =__NR_access
|
||||
ldr r7, =__NR_mknodat
|
||||
swi #0
|
||||
mov r7, ip
|
||||
cmn r0, #(MAX_ERRNO + 1)
|
||||
bxls lr
|
||||
neg r0, r0
|
||||
b __set_errno
|
||||
END(access)
|
||||
END(mknodat)
|
||||
@@ -1,16 +0,0 @@
|
||||
/* Generated by gensyscalls.py. Do not edit. */
|
||||
|
||||
#include <asm/unistd.h>
|
||||
#include <linux/err.h>
|
||||
#include <machine/asm.h>
|
||||
|
||||
ENTRY(readlink)
|
||||
mov ip, r7
|
||||
ldr r7, =__NR_readlink
|
||||
swi #0
|
||||
mov r7, ip
|
||||
cmn r0, #(MAX_ERRNO + 1)
|
||||
bxls lr
|
||||
neg r0, r0
|
||||
b __set_errno
|
||||
END(readlink)
|
||||
@@ -4,13 +4,13 @@
|
||||
#include <linux/err.h>
|
||||
#include <machine/asm.h>
|
||||
|
||||
ENTRY(chown)
|
||||
ENTRY(readlinkat)
|
||||
mov ip, r7
|
||||
ldr r7, =__NR_chown32
|
||||
ldr r7, =__NR_readlinkat
|
||||
swi #0
|
||||
mov r7, ip
|
||||
cmn r0, #(MAX_ERRNO + 1)
|
||||
bxls lr
|
||||
neg r0, r0
|
||||
b __set_errno
|
||||
END(chown)
|
||||
END(readlinkat)
|
||||
@@ -1,16 +0,0 @@
|
||||
/* Generated by gensyscalls.py. Do not edit. */
|
||||
|
||||
#include <asm/unistd.h>
|
||||
#include <linux/err.h>
|
||||
#include <machine/asm.h>
|
||||
|
||||
ENTRY(rename)
|
||||
mov ip, r7
|
||||
ldr r7, =__NR_rename
|
||||
swi #0
|
||||
mov r7, ip
|
||||
cmn r0, #(MAX_ERRNO + 1)
|
||||
bxls lr
|
||||
neg r0, r0
|
||||
b __set_errno
|
||||
END(rename)
|
||||
@@ -1,16 +0,0 @@
|
||||
/* Generated by gensyscalls.py. Do not edit. */
|
||||
|
||||
#include <asm/unistd.h>
|
||||
#include <linux/err.h>
|
||||
#include <machine/asm.h>
|
||||
|
||||
ENTRY(rmdir)
|
||||
mov ip, r7
|
||||
ldr r7, =__NR_rmdir
|
||||
swi #0
|
||||
mov r7, ip
|
||||
cmn r0, #(MAX_ERRNO + 1)
|
||||
bxls lr
|
||||
neg r0, r0
|
||||
b __set_errno
|
||||
END(rmdir)
|
||||
@@ -1,16 +0,0 @@
|
||||
/* Generated by gensyscalls.py. Do not edit. */
|
||||
|
||||
#include <asm/unistd.h>
|
||||
#include <linux/err.h>
|
||||
#include <machine/asm.h>
|
||||
|
||||
ENTRY(stat)
|
||||
mov ip, r7
|
||||
ldr r7, =__NR_stat64
|
||||
swi #0
|
||||
mov r7, ip
|
||||
cmn r0, #(MAX_ERRNO + 1)
|
||||
bxls lr
|
||||
neg r0, r0
|
||||
b __set_errno
|
||||
END(stat)
|
||||
@@ -1,16 +0,0 @@
|
||||
/* Generated by gensyscalls.py. Do not edit. */
|
||||
|
||||
#include <asm/unistd.h>
|
||||
#include <linux/err.h>
|
||||
#include <machine/asm.h>
|
||||
|
||||
ENTRY(symlink)
|
||||
mov ip, r7
|
||||
ldr r7, =__NR_symlink
|
||||
swi #0
|
||||
mov r7, ip
|
||||
cmn r0, #(MAX_ERRNO + 1)
|
||||
bxls lr
|
||||
neg r0, r0
|
||||
b __set_errno
|
||||
END(symlink)
|
||||
@@ -4,13 +4,13 @@
|
||||
#include <linux/err.h>
|
||||
#include <machine/asm.h>
|
||||
|
||||
ENTRY(chmod)
|
||||
ENTRY(symlinkat)
|
||||
mov ip, r7
|
||||
ldr r7, =__NR_chmod
|
||||
ldr r7, =__NR_symlinkat
|
||||
swi #0
|
||||
mov r7, ip
|
||||
cmn r0, #(MAX_ERRNO + 1)
|
||||
bxls lr
|
||||
neg r0, r0
|
||||
b __set_errno
|
||||
END(chmod)
|
||||
END(symlinkat)
|
||||
@@ -1,16 +0,0 @@
|
||||
/* Generated by gensyscalls.py. Do not edit. */
|
||||
|
||||
#include <asm/unistd.h>
|
||||
#include <linux/err.h>
|
||||
#include <machine/asm.h>
|
||||
|
||||
ENTRY(unlink)
|
||||
mov ip, r7
|
||||
ldr r7, =__NR_unlink
|
||||
swi #0
|
||||
mov r7, ip
|
||||
cmn r0, #(MAX_ERRNO + 1)
|
||||
bxls lr
|
||||
neg r0, r0
|
||||
b __set_errno
|
||||
END(unlink)
|
||||
@@ -1,16 +0,0 @@
|
||||
/* Generated by gensyscalls.py. Do not edit. */
|
||||
|
||||
#include <asm/unistd.h>
|
||||
#include <linux/err.h>
|
||||
#include <machine/asm.h>
|
||||
|
||||
ENTRY(utimes)
|
||||
mov ip, r7
|
||||
ldr r7, =__NR_utimes
|
||||
swi #0
|
||||
mov r7, ip
|
||||
cmn r0, #(MAX_ERRNO + 1)
|
||||
bxls lr
|
||||
neg r0, r0
|
||||
b __set_errno
|
||||
END(utimes)
|
||||
Reference in New Issue
Block a user