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