Fix syscalls on 4.3's bionic

Change-Id: Ibaeaa30ce88880338cd0236791f7db4cac8289b5

16 files changed, 16 insertions, 22 deletions

diff --git a/android/libc/arch-arm/syscalls/adjtimex.S b/android/libc/arch-arm/syscalls/adjtimex.S
index 4c06fc6..dabdb90 100644
--- a/android/libc/arch-arm/syscalls/adjtimex.S
+++ b/android/libc/arch-arm/syscalls/adjtimex.S
@@ -1,6 +1,5 @@
 /* autogenerated by gensyscalls.py */
 #include <asm/unistd.h>
-#include <sys/linux-syscalls.h>
 
     .text
     .type adjtimex, #function
@@ -16,5 +15,5 @@ adjtimex:
     ldmfd   sp!, {r4, r7}
     movs    r0, r0
     bxpl    lr
-    b       __set_syscall_errno
+    b       __set_errno
     .fnend
diff --git a/android/libc/arch-arm/syscalls/getsid.S b/android/libc/arch-arm/syscalls/getsid.S
index a2c3f3d..fd9e9ee 100644
--- a/android/libc/arch-arm/syscalls/getsid.S
+++ b/android/libc/arch-arm/syscalls/getsid.S
@@ -1,6 +1,5 @@
 /* autogenerated by gensyscalls.py */
 #include <asm/unistd.h>
-#include <sys/linux-syscalls.h>
 
     .text
     .type getsid, #function
@@ -16,5 +15,5 @@ getsid:
     ldmfd   sp!, {r4, r7}
     movs    r0, r0
     bxpl    lr
-    b       __set_syscall_errno
+    b       __set_errno
     .fnend
diff --git a/android/libc/arch-arm/syscalls/stime.S b/android/libc/arch-arm/syscalls/stime.S
index ef80e1b..e53684c 100644
--- a/android/libc/arch-arm/syscalls/stime.S
+++ b/android/libc/arch-arm/syscalls/stime.S
@@ -1,7 +1,6 @@
 /* autogenerated by gensyscalls.py */
 #define __KERNEL__
 #include <asm/unistd.h>
-#include <sys/linux-syscalls.h>
 
 #ifndef __NR_stime
 #define __NR_stime (__NR_SYSCALL_BASE + 25)
@@ -21,5 +20,5 @@ stime:
     ldmfd   sp!, {r4, r7}
     movs    r0, r0
     bxpl    lr
-    b       __set_syscall_errno
+    b       __set_errno
     .fnend
diff --git a/android/libc/arch-arm/syscalls/swapoff.S b/android/libc/arch-arm/syscalls/swapoff.S
index bd40f49..7117295 100644
--- a/android/libc/arch-arm/syscalls/swapoff.S
+++ b/android/libc/arch-arm/syscalls/swapoff.S
@@ -1,6 +1,5 @@
 /* autogenerated by gensyscalls.py */
 #include <asm/unistd.h>
-#include <sys/linux-syscalls.h>
 
     .text
     .type swapoff, #function
@@ -16,5 +15,5 @@ swapoff:
     ldmfd   sp!, {r4, r7}
     movs    r0, r0
     bxpl    lr
-    b       __set_syscall_errno
+    b       __set_errno
     .fnend
diff --git a/android/libc/arch-arm/syscalls/swapon.S b/android/libc/arch-arm/syscalls/swapon.S
index 9046ede..fb86331 100644
--- a/android/libc/arch-arm/syscalls/swapon.S
+++ b/android/libc/arch-arm/syscalls/swapon.S
@@ -1,6 +1,5 @@
 /* autogenerated by gensyscalls.py */
 #include <asm/unistd.h>
-#include <sys/linux-syscalls.h>
 
     .text
     .type swapon, #function
@@ -16,5 +15,5 @@ swapon:
     ldmfd   sp!, {r4, r7}
     movs    r0, r0
     bxpl    lr
-    b       __set_syscall_errno
+    b       __set_errno
     .fnend
diff --git a/android/libc/arch-arm/syscalls/sysinfo.S b/android/libc/arch-arm/syscalls/sysinfo.S
index c617269..3ffad4e 100644
--- a/android/libc/arch-arm/syscalls/sysinfo.S
+++ b/android/libc/arch-arm/syscalls/sysinfo.S
@@ -1,6 +1,5 @@
 /* autogenerated by gensyscalls.py */
 #include <asm/unistd.h>
-#include <sys/linux-syscalls.h>
 
     .text
     .type sysinfo, #function
@@ -16,5 +15,5 @@ sysinfo:
     ldmfd   sp!, {r4, r7}
     movs    r0, r0
     bxpl    lr
-    b       __set_syscall_errno
+    b       __set_errno
     .fnend
diff --git a/android/libc/arch-mips/syscalls/adjtimex.S b/android/libc/arch-mips/syscalls/adjtimex.S
index 1af7b24..4779c43 100644
--- a/android/libc/arch-mips/syscalls/adjtimex.S
+++ b/android/libc/arch-mips/syscalls/adjtimex.S
@@ -1,5 +1,5 @@
 /* autogenerated by gensyscalls.py */
-#include <sys/linux-syscalls.h>
+#include <asm/unistd.h>
     .text
     .globl adjtimex
     .align 4
diff --git a/android/libc/arch-mips/syscalls/getsid.S b/android/libc/arch-mips/syscalls/getsid.S
index f61dee5..c960407 100644
--- a/android/libc/arch-mips/syscalls/getsid.S
+++ b/android/libc/arch-mips/syscalls/getsid.S
@@ -1,5 +1,5 @@
 /* autogenerated by gensyscalls.py */
-#include <sys/linux-syscalls.h>
+#include <asm/unistd.h>
     .text
     .globl getsid
     .align 4
diff --git a/android/libc/arch-mips/syscalls/stime.S b/android/libc/arch-mips/syscalls/stime.S
index e640283..141aef6 100644
--- a/android/libc/arch-mips/syscalls/stime.S
+++ b/android/libc/arch-mips/syscalls/stime.S
@@ -1,5 +1,5 @@
 /* autogenerated by gensyscalls.py */
-#include <sys/linux-syscalls.h>
+#include <asm/unistd.h>
     .text
     .globl stime
     .align 4
diff --git a/android/libc/arch-mips/syscalls/swapoff.S b/android/libc/arch-mips/syscalls/swapoff.S
index 45e9ddb..5e851d5 100644
--- a/android/libc/arch-mips/syscalls/swapoff.S
+++ b/android/libc/arch-mips/syscalls/swapoff.S
@@ -1,5 +1,5 @@
 /* autogenerated by gensyscalls.py */
-#include <sys/linux-syscalls.h>
+#include <asm/unistd.h>
     .text
     .globl swapoff
     .align 4
diff --git a/android/libc/arch-mips/syscalls/swapon.S b/android/libc/arch-mips/syscalls/swapon.S
index a2c27ef..f4d1b3d 100644
--- a/android/libc/arch-mips/syscalls/swapon.S
+++ b/android/libc/arch-mips/syscalls/swapon.S
@@ -1,5 +1,5 @@
 /* autogenerated by gensyscalls.py */
-#include <sys/linux-syscalls.h>
+#include <asm/unistd.h>
     .text
     .globl swapon
     .align 4
diff --git a/android/libc/arch-mips/syscalls/sysinfo.S b/android/libc/arch-mips/syscalls/sysinfo.S
index 3f63504..6f4580f 100644
--- a/android/libc/arch-mips/syscalls/sysinfo.S
+++ b/android/libc/arch-mips/syscalls/sysinfo.S
@@ -1,5 +1,5 @@
 /* autogenerated by gensyscalls.py */
-#include <sys/linux-syscalls.h>
+#include <asm/unistd.h>
     .text
     .globl sysinfo
     .align 4
diff --git a/include-full/applets.h b/include-full/applets.h
index e0a3623..65a5017 100644
--- a/include-full/applets.h
+++ b/include-full/applets.h
@@ -107,12 +107,12 @@ IF_DEPMOD(APPLET(depmod, BB_DIR_SBIN, BB_SUID_DROP))
 IF_INSMOD(APPLET(insmod, BB_DIR_SBIN, BB_SUID_DROP))
 IF_LSMOD(APPLET(lsmod, BB_DIR_SBIN, BB_SUID_DROP))
 IF_MODINFO(APPLET(modinfo, BB_DIR_SBIN, BB_SUID_DROP))
+IF_MODPROBE(APPLET(modprobe, BB_DIR_SBIN, BB_SUID_DROP))
 IF_MODPROBE_SMALL(APPLET(modprobe, BB_DIR_SBIN, BB_SUID_DROP))
 IF_MODPROBE_SMALL(APPLET_ODDNAME(depmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, modprobe))
 IF_MODPROBE_SMALL(APPLET_ODDNAME(insmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, modprobe))
 IF_MODPROBE_SMALL(APPLET_ODDNAME(lsmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, modprobe))
 IF_MODPROBE_SMALL(APPLET_ODDNAME(rmmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, modprobe))
-IF_MODPROBE(APPLET(modprobe, BB_DIR_SBIN, BB_SUID_DROP))
 IF_RMMOD(APPLET(rmmod, BB_DIR_SBIN, BB_SUID_DROP))
 IF_NBDCLIENT(APPLET_ODDNAME(nbd-client, nbdclient, BB_DIR_USR_SBIN, BB_SUID_DROP, nbdclient))
 IF_PING(APPLET(ping, BB_DIR_BIN, BB_SUID_MAYBE))
diff --git a/include-full/autoconf.h b/include-full/autoconf.h
index 79c5339..1a9a19e 100644
--- a/include-full/autoconf.h
+++ b/include-full/autoconf.h
@@ -2,7 +2,7 @@
  * Automatically generated C config: don't edit
  * Busybox version: 1.21.1-jb
  */
-#define AUTOCONF_TIMESTAMP "2013-07-01 01:04 +0200"
+#define AUTOCONF_TIMESTAMP "2013-07-25 21:21 +0100"
 
 #define CONFIG_HAVE_DOT_CONFIG 1
 #define ENABLE_HAVE_DOT_CONFIG 1
diff --git a/include-minimal/applets.h b/include-minimal/applets.h
index e0a3623..65a5017 100644
--- a/include-minimal/applets.h
+++ b/include-minimal/applets.h
@@ -107,12 +107,12 @@ IF_DEPMOD(APPLET(depmod, BB_DIR_SBIN, BB_SUID_DROP))
 IF_INSMOD(APPLET(insmod, BB_DIR_SBIN, BB_SUID_DROP))
 IF_LSMOD(APPLET(lsmod, BB_DIR_SBIN, BB_SUID_DROP))
 IF_MODINFO(APPLET(modinfo, BB_DIR_SBIN, BB_SUID_DROP))
+IF_MODPROBE(APPLET(modprobe, BB_DIR_SBIN, BB_SUID_DROP))
 IF_MODPROBE_SMALL(APPLET(modprobe, BB_DIR_SBIN, BB_SUID_DROP))
 IF_MODPROBE_SMALL(APPLET_ODDNAME(depmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, modprobe))
 IF_MODPROBE_SMALL(APPLET_ODDNAME(insmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, modprobe))
 IF_MODPROBE_SMALL(APPLET_ODDNAME(lsmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, modprobe))
 IF_MODPROBE_SMALL(APPLET_ODDNAME(rmmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, modprobe))
-IF_MODPROBE(APPLET(modprobe, BB_DIR_SBIN, BB_SUID_DROP))
 IF_RMMOD(APPLET(rmmod, BB_DIR_SBIN, BB_SUID_DROP))
 IF_NBDCLIENT(APPLET_ODDNAME(nbd-client, nbdclient, BB_DIR_USR_SBIN, BB_SUID_DROP, nbdclient))
 IF_PING(APPLET(ping, BB_DIR_BIN, BB_SUID_MAYBE))
diff --git a/include-minimal/autoconf.h b/include-minimal/autoconf.h
index 7c61662..fb2c8f9 100644
--- a/include-minimal/autoconf.h
+++ b/include-minimal/autoconf.h
@@ -2,7 +2,7 @@
  * Automatically generated C config: don't edit
  * Busybox version: 1.21.1-jb
  */
-#define AUTOCONF_TIMESTAMP "2013-07-01 01:03 +0200"
+#define AUTOCONF_TIMESTAMP "2013-07-25 21:21 +0100"
 
 #define CONFIG_HAVE_DOT_CONFIG 1
 #define ENABLE_HAVE_DOT_CONFIG 1