These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / s390 / kernel / runtime_instr.c

diff --git a/kernel/arch/s390/kernel/runtime_instr.c b/kernel/arch/s390/kernel/runtime_instr.c
index 26b4ae9..fffa0e5 100644 (file)
--- a/kernel/arch/s390/kernel/runtime_instr.c
+++ b/kernel/arch/s390/kernel/runtime_instr.c
@@ -18,11 +18,6 @@
 /* empty control block to disable RI by loading it */
 struct runtime_instr_cb runtime_instr_empty_cb;
 
-static int runtime_instr_avail(void)
-{
-       return test_facility(64);
-}
-
 static void disable_runtime_instr(void)
 {
        struct pt_regs *regs = task_pt_regs(current);
@@ -40,7 +35,6 @@ static void disable_runtime_instr(void)
 static void init_runtime_instr_cb(struct runtime_instr_cb *cb)
 {
        cb->buf_limit = 0xfff;
-       cb->int_requested = 1;
        cb->pstate = 1;
        cb->pstate_set_buf = 1;
        cb->pstate_sample = 1;
@@ -57,46 +51,14 @@ void exit_thread_runtime_instr(void)
                return;
        disable_runtime_instr();
        kfree(task->thread.ri_cb);
-       task->thread.ri_signum = 0;
        task->thread.ri_cb = NULL;
 }
 
-static void runtime_instr_int_handler(struct ext_code ext_code,
-                               unsigned int param32, unsigned long param64)
-{
-       struct siginfo info;
-
-       if (!(param32 & CPU_MF_INT_RI_MASK))
-               return;
-
-       inc_irq_stat(IRQEXT_CMR);
-
-       if (!current->thread.ri_cb)
-               return;
-       if (current->thread.ri_signum < SIGRTMIN ||
-           current->thread.ri_signum > SIGRTMAX) {
-               WARN_ON_ONCE(1);
-               return;
-       }
-
-       memset(&info, 0, sizeof(info));
-       info.si_signo = current->thread.ri_signum;
-       info.si_code = SI_QUEUE;
-       if (param32 & CPU_MF_INT_RI_BUF_FULL)
-               info.si_int = ENOBUFS;
-       else if (param32 & CPU_MF_INT_RI_HALTED)
-               info.si_int = ECANCELED;
-       else
-               return; /* unknown reason */
-
-       send_sig_info(current->thread.ri_signum, &info, current);
-}
-
-SYSCALL_DEFINE2(s390_runtime_instr, int, command, int, signum)
+SYSCALL_DEFINE1(s390_runtime_instr, int, command)
 {
        struct runtime_instr_cb *cb;
 
-       if (!runtime_instr_avail())
+       if (!test_facility(64))
                return -EOPNOTSUPP;
 
        if (command == S390_RUNTIME_INSTR_STOP) {
@@ -106,8 +68,7 @@ SYSCALL_DEFINE2(s390_runtime_instr, int, command, int, signum)
                return 0;
        }
 
-       if (command != S390_RUNTIME_INSTR_START ||
-           (signum < SIGRTMIN || signum > SIGRTMAX))
+       if (command != S390_RUNTIME_INSTR_START)
                return -EINVAL;
 
        if (!current->thread.ri_cb) {
@@ -120,7 +81,6 @@ SYSCALL_DEFINE2(s390_runtime_instr, int, command, int, signum)
        }
 
        init_runtime_instr_cb(cb);
-       current->thread.ri_signum = signum;
 
        /* now load the control block to make it available */
        preempt_disable();
@@ -129,21 +89,3 @@ SYSCALL_DEFINE2(s390_runtime_instr, int, command, int, signum)
        preempt_enable();
        return 0;
 }
-
-static int __init runtime_instr_init(void)
-{
-       int rc;
-
-       if (!runtime_instr_avail())
-               return 0;
-
-       irq_subclass_register(IRQ_SUBCLASS_MEASUREMENT_ALERT);
-       rc = register_external_irq(EXT_IRQ_MEASURE_ALERT,
-                                  runtime_instr_int_handler);
-       if (rc)
-               irq_subclass_unregister(IRQ_SUBCLASS_MEASUREMENT_ALERT);
-       else
-               pr_info("Runtime instrumentation facility initialized\n");
-       return rc;
-}
-device_initcall(runtime_instr_init);