extern asmlinkage void sys_ni_syscall(void);
-__visible const sys_call_ptr_t ia32_sys_call_table[__NR_ia32_syscall_max+1] = {
+__visible sys_call_ptr_t ia32_sys_call_table[__NR_ia32_syscall_max+1] = {
/*
* Smells like a compiler bug -- it doesn't work
* when the & below is removed.
#ifndef _DTRACE_OS_H_
#define _DTRACE_OS_H_
-#include <asm/unistd.h>
-
#define PR_PSARGS_SZ 80
typedef struct dtrace_psinfo {
char psargs[PR_PSARGS_SZ];
} dtrace_psinfo_t;
+#ifndef COMPILE_OFFSETS
+
+#include <asm/asm-offsets.h>
+
extern dtrace_psinfo_t *dtrace_psinfo_alloc(struct task_struct *);
extern void dtrace_psinfo_free(dtrace_psinfo_t *);
-#ifdef NR_syscalls
typedef uint32_t dtrace_id_t;
#define DTRACE_IDNONE 0
extern void dtrace_fbt_init(fbt_provide_fn);
-#endif
+#endif /* COMPILE_OFFSETS */
#endif /* _DTRACE_OS_H_ */
#include <linux/percpu.h>
#include <asm/module.h>
-#include <trace/events/module.h>
#include <linux/sdt.h>
/* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
int order;
unsigned int may_oom:1;
} memcg_oom;
+#endif
#ifdef CONFIG_DTRACE
uint32_t predcache;
ktime_t dtrace_vtime;
#include <linux/proc_ns.h>
#include <linux/io.h>
#include <linux/sdt.h>
-#include <linux/dtrace_os.h>
-#include <linux/dtrace_cpu.h>
#include <asm/io.h>
#include <asm/bugs.h>
static inline void mark_rodata_ro(void) { }
#endif
+#ifdef CONFIG_DTRACE
+extern void dtrace_os_init(void);
+extern void dtrace_cpu_init(void);
+#endif
+
/*
* Debug helper: via this flag we know that we are in 'early bootup code'
* where only the boot processor is running with IRQ disabled. This means
[SCE_RT_SIGRETURN] dtrace_stub_rt_sigreturn,
},
{
-/*
- * Need to remove the define for _ASM_X86_UNISTD_64_H in order for unistd_64
- * to be included here because it was already included indirectly.
- */
-#undef __SYSCALL
-#define __SYSCALL(nr, sym) [nr] { __stringify(sym), },
-# undef _ASM_X86_UNISTD_64_H
-#include <asm/unistd.h>
+#define __SYSCALL_64(nr, sym, compat) [nr] { __stringify(sym), },
+#define __SYSCALL_COMMON(nr, sym, compat) __SYSCALL_64(nr, sym, compat)
+#define __SYSCALL_X32(nt, sym, compat)
+#include <asm/syscalls_64.h>
}
};
#include <linux/binfmts.h>
#include <linux/context_tracking.h>
#include <linux/compiler.h>
-#include <linux/dtrace_cpu.h>
#include <asm/switch_to.h>
#include <asm/tlb.h>