Remove #include <asm/unistd.h> from linux_syscall_ranges.h and syscall.cc.

sandbox/linux/bpf_dsl/linux_syscall_ranges.h

Index: sandbox/linux/bpf_dsl/linux_syscall_ranges.h
diff --git a/sandbox/linux/bpf_dsl/linux_syscall_ranges.h b/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
index a26a166be9ebbf7904f96fb5a38f3f06b57a924d..ca5ef528dd6545fb35929143a06b34e52e731cef 100644
--- a/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
+++ b/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
@@ -5,8 +5,6 @@
 #ifndef SANDBOX_LINUX_BPF_DSL_LINUX_SYSCALL_RANGES_H_
 #define SANDBOX_LINUX_BPF_DSL_LINUX_SYSCALL_RANGES_H_
 
-#include <asm/unistd.h>  // For __NR_SYSCALL_BASE
-
 #if defined(__x86_64__)
 
 #define MIN_SYSCALL         0u
@@ -25,6 +23,15 @@
 // and a "ghost syscall private to the kernel", cmpxchg,
 // at |__ARM_NR_BASE+0x00fff0|.
 // See </arch/arm/include/asm/unistd.h> in the Linux kernel.
+
+#if !defined(__NR_SYSCALL_BASE)
+#define __NR_SYSCALL_BASE 0

[mdempsky, 2015/04/08 18:23:51]

Unless you think there's any particular value to still providing these #defines
broken out separately, I'd probably just inline them below and simplify like for
x86-64 and x86 above.

[hidehiko, 2015/04/09 02:34:37]

Done.

+#endif
+
+#if !defined(__ARM_NR_BASE)
+#define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xf0000u)
+#endif
+
 #define MIN_SYSCALL         ((unsigned int)__NR_SYSCALL_BASE)
 #define MAX_PUBLIC_SYSCALL  (MIN_SYSCALL + 1024u)
 #define MIN_PRIVATE_SYSCALL ((unsigned int)__ARM_NR_BASE)