add sparc64 arch-dependent bits

5 files changed, 43 insertions, 2 deletions

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 10b212a1f9f5..8d90b5a63749 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -471,3 +471,5 @@ source "security/Kconfig"
 source "crypto/Kconfig"
 
 source "lib/Kconfig"
+
+source "litmus/Kconfig"
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index c39944927f1a..55f1ebd74fa7 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -46,6 +46,9 @@
 #include <asm/ldc.h>
 #include <asm/hypervisor.h>
 
+#include <litmus/litmus.h>
+#include <litmus/trace.h>
+
 extern void calibrate_delay(void);
 
 int sparc64_multi_core __read_mostly;
@@ -1033,6 +1036,8 @@ void smp_receive_signal(int cpu)
 void smp_receive_signal_client(int irq, struct pt_regs *regs)
 {
         clear_softint(1 << irq);
+        set_tsk_need_resched(current);
+        TS_SEND_RESCHED_END;
 }
 
 void smp_new_mmu_context_version_client(int irq, struct pt_regs *regs)
@@ -1413,6 +1418,7 @@ void __init smp_cpus_done(unsigned int max_cpus)
 
 void smp_send_reschedule(int cpu)
 {
+        TS_SEND_RESCHED_START(cpu);
         smp_receive_signal(cpu);
 }
 
diff --git a/arch/sparc64/kernel/systbls.S b/arch/sparc64/kernel/systbls.S
index 06d10907d8ce..96a74d3ab11a 100644
--- a/arch/sparc64/kernel/systbls.S
+++ b/arch/sparc64/kernel/systbls.S
@@ -82,6 +82,13 @@ sys_call_table32:
         .word compat_sys_set_mempolicy, compat_sys_kexec_load, compat_sys_move_pages, sys_getcpu, compat_sys_epoll_pwait
 /*310*/ .word compat_sys_utimensat, compat_sys_signalfd, compat_sys_timerfd, sys_eventfd, compat_sys_fallocate
 
+/*LITMUS, 315*/
+        .word sys_set_rt_task_param, sys_get_rt_task_param, sys_complete_job, sys_od_open, sys_od_close
+/*320*/
+        .word sys_fmlp_down, sys_fmlp_up, sys_srp_down, sys_srp_up, sys_query_job_no
+/*325*/ .word sys_wait_for_job_release, sys_wait_for_ts_release, sys_release_ts
+
+
 #endif /* CONFIG_COMPAT */
 
         /* Now the 64-bit native Linux syscall table. */
@@ -154,6 +161,12 @@ sys_call_table:
         .word sys_set_mempolicy, sys_kexec_load, sys_move_pages, sys_getcpu, sys_epoll_pwait
 /*310*/ .word sys_utimensat, sys_signalfd, sys_timerfd, sys_eventfd, sys_fallocate
 
+/*LITMUS, 315*/
+        .word sys_set_rt_task_param, sys_get_rt_task_param, sys_complete_job, sys_od_open, sys_od_close
+/*320*/
+        .word sys_fmlp_down, sys_fmlp_up, sys_srp_down, sys_srp_up, sys_query_job_no
+/*325*/ .word sys_wait_for_job_release, sys_wait_for_ts_release, sys_release_ts, sys_null_call
+
 #if defined(CONFIG_SUNOS_EMUL) || defined(CONFIG_SOLARIS_EMUL) || \
     defined(CONFIG_SOLARIS_EMUL_MODULE)
         /* Now the 32-bit SunOS syscall table. */
@@ -271,6 +284,11 @@ sunos_sys_table:
         .word sunos_nosys, sunos_nosys, sunos_nosys
         .word sunos_nosys
 /*310*/ .word sunos_nosys, sunos_nosys, sunos_nosys
-        .word sunos_nosys, sunos_nosys
+        .word sunos_nosys, sunos_nosys, sunos_nosys
+        .word sunos_nosys, sunos_nosys, sunos_nosys
+        .word sunos_nosys
+/*320*/ .word sunos_nosys, sunos_nosys, sunos_nosys
+        .word sunos_nosys, sunos_nosys, sunos_nosys
+        .word sunos_nosys, sunos_nosys, sunos_nosys
 
 #endif
diff --git a/include/asm-sparc64/feather_trace.h b/include/asm-sparc64/feather_trace.h
new file mode 100644
index 000000000000..869a3e003628
--- /dev/null
+++ b/include/asm-sparc64/feather_trace.h
@@ -0,0 +1,11 @@
+#ifndef _ARCH_FEATHER_TRACE_H
+#define _ARCH_FEATHER_TRACE_H
+
+#include <asm/timex.h>
+
+static inline unsigned long long ft_timestamp(void)
+{
+        return get_cycles();
+}
+
+#endif
diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h
index cb751b4d0f56..ebebde69c34d 100644
--- a/include/asm-sparc64/unistd.h
+++ b/include/asm-sparc64/unistd.h
@@ -333,7 +333,11 @@
 #define __NR_eventfd            313
 #define __NR_fallocate          314
 
-#define NR_SYSCALLS             315
+#define __NR_LITMUS             315
+
+#include "litmus/unistd.h"
+
+#define NR_SYSCALLS             315 + NR_litmus_syscalls
 
 #ifdef __KERNEL__
 /* sysconf options, for SunOS compatibility */