1*053f45beSAndroid Build Coastguard WorkerFrom ae48c76fa42062b11f7fd522020abf511982316b Mon Sep 17 00:00:00 2001
2*053f45beSAndroid Build Coastguard WorkerFrom: Tri Vo <[email protected]>
3*053f45beSAndroid Build Coastguard WorkerDate: Sun, 28 Aug 2016 16:55:24 -0700
4*053f45beSAndroid Build Coastguard WorkerSubject: [PATCH 01/20] Removes unsupported testcases for ftrace, compiles
5*053f45beSAndroid Build Coastguard Worker membarrier, net/psock_tpacket, timers/valid-adjtimex. Added a list of
6*053f45beSAndroid Build Coastguard Worker testfiles that could potentially be compiled in Android.kselftest.mk.
7*053f45beSAndroid Build Coastguard Worker
8*053f45beSAndroid Build Coastguard Worker(cherry picked from commit cd038753c3543ee6919469a4472cdf86ea0121c8)
9*053f45beSAndroid Build Coastguard Worker---
10*053f45beSAndroid Build Coastguard Worker tools/testing/selftests/net/psock_tpacket.c     | 2 ++
11*053f45beSAndroid Build Coastguard Worker tools/testing/selftests/timers/valid-adjtimex.c | 3 ++-
12*053f45beSAndroid Build Coastguard Worker 2 files changed, 4 insertions(+), 1 deletion(-)
13*053f45beSAndroid Build Coastguard Worker
14*053f45beSAndroid Build Coastguard Workerdiff --git a/tools/testing/selftests/net/psock_tpacket.c b/tools/testing/selftests/net/psock_tpacket.c
15*053f45beSAndroid Build Coastguard Workerindex 404a2ce759ab..e5a4c53076d2 100644
16*053f45beSAndroid Build Coastguard Worker--- a/tools/testing/selftests/net/psock_tpacket.c
17*053f45beSAndroid Build Coastguard Worker+++ b/tools/testing/selftests/net/psock_tpacket.c
18*053f45beSAndroid Build Coastguard Worker@@ -33,7 +33,9 @@
19*053f45beSAndroid Build Coastguard Worker #include <ctype.h>
20*053f45beSAndroid Build Coastguard Worker #include <fcntl.h>
21*053f45beSAndroid Build Coastguard Worker #include <unistd.h>
22*053f45beSAndroid Build Coastguard Worker+#ifndef __ANDROID__
23*053f45beSAndroid Build Coastguard Worker #include <bits/wordsize.h>
24*053f45beSAndroid Build Coastguard Worker+#endif
25*053f45beSAndroid Build Coastguard Worker #include <net/ethernet.h>
26*053f45beSAndroid Build Coastguard Worker #include <netinet/ip.h>
27*053f45beSAndroid Build Coastguard Worker #include <arpa/inet.h>
28*053f45beSAndroid Build Coastguard Workerdiff --git a/tools/testing/selftests/timers/valid-adjtimex.c b/tools/testing/selftests/timers/valid-adjtimex.c
29*053f45beSAndroid Build Coastguard Workerindex 48b9a803235a..ecac8fadd939 100644
30*053f45beSAndroid Build Coastguard Worker--- a/tools/testing/selftests/timers/valid-adjtimex.c
31*053f45beSAndroid Build Coastguard Worker+++ b/tools/testing/selftests/timers/valid-adjtimex.c
32*053f45beSAndroid Build Coastguard Worker@@ -39,12 +39,13 @@
33*053f45beSAndroid Build Coastguard Worker
34*053f45beSAndroid Build Coastguard Worker #define ADJ_SETOFFSET 0x0100
35*053f45beSAndroid Build Coastguard Worker
36*053f45beSAndroid Build Coastguard Worker+#ifndef __ANDROID__
37*053f45beSAndroid Build Coastguard Worker #include <sys/syscall.h>
38*053f45beSAndroid Build Coastguard Worker int clock_adjtime(clockid_t id, struct timex *tx)
39*053f45beSAndroid Build Coastguard Worker {
40*053f45beSAndroid Build Coastguard Worker 	return syscall(__NR_clock_adjtime, id, tx);
41*053f45beSAndroid Build Coastguard Worker }
42*053f45beSAndroid Build Coastguard Worker-
43*053f45beSAndroid Build Coastguard Worker+#endif
44*053f45beSAndroid Build Coastguard Worker
45*053f45beSAndroid Build Coastguard Worker /* clear NTP time_status & time_state */
46*053f45beSAndroid Build Coastguard Worker int clear_time_state(void)
47*053f45beSAndroid Build Coastguard Worker--
48*053f45beSAndroid Build Coastguard Worker2.42.0.609.gbb76f46606-goog
49*053f45beSAndroid Build Coastguard Worker
50