Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b38feccd authored by Martin Schwidefsky's avatar Martin Schwidefsky
Browse files

s390: remove runtime instrumentation interrupts 



The external interrupts for runtime instrumentation buffer-full
and runtime instrumentation halted are unused and have no current
user. Remove the support and ignore the second parameter of the
s390_runtime_instr system call from now on.

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent e510f681

arch/s390/include/asm/cpu_mf.h

+0 −5
Original line number Diff line number Diff line
@@ -22,15 +22,10 @@ 
#define CPU_MF_INT_SF_LSDA	(1 << 22)	/* loss of sample data alert */

#define CPU_MF_INT_CF_CACA	(1 <<  7)	/* counter auth. change alert */

#define CPU_MF_INT_CF_LCDA	(1 <<  6)	/* loss of counter data alert */

#define CPU_MF_INT_RI_HALTED	(1 <<  5)	/* run-time instr. halted */

#define CPU_MF_INT_RI_BUF_FULL	(1 <<  4)	/* run-time instr. program

						   buffer full */



#define CPU_MF_INT_CF_MASK	(CPU_MF_INT_CF_CACA|CPU_MF_INT_CF_LCDA)

#define CPU_MF_INT_SF_MASK	(CPU_MF_INT_SF_IAE|CPU_MF_INT_SF_ISE|	\

				 CPU_MF_INT_SF_PRA|CPU_MF_INT_SF_SACA|	\

				 CPU_MF_INT_SF_LSDA)

#define CPU_MF_INT_RI_MASK	(CPU_MF_INT_RI_HALTED|CPU_MF_INT_RI_BUF_FULL)



/* CPU measurement facility support */

static inline int cpum_cf_avail(void)

arch/s390/include/asm/irq.h

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ enum interruption_class { 
	IRQEXT_IUC,

	IRQEXT_CMS,

	IRQEXT_CMC,

	IRQEXT_CMR,

	IRQEXT_FTP,

	IRQIO_CIO,

	IRQIO_QAI,

arch/s390/include/asm/processor.h

+0 −1
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ struct thread_struct { 
	struct list_head list;

	/* cpu runtime instrumentation */

	struct runtime_instr_cb *ri_cb;

	int ri_signum;

	unsigned char trap_tdb[256];	/* Transaction abort diagnose block */

};

arch/s390/kernel/irq.c

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ static const struct irq_class irqclass_sub_desc[] = { 
	{.irq = IRQEXT_IUC, .name = "IUC", .desc = "[EXT] IUCV"},

	{.irq = IRQEXT_CMS, .name = "CMS", .desc = "[EXT] CPU-Measurement: Sampling"},

	{.irq = IRQEXT_CMC, .name = "CMC", .desc = "[EXT] CPU-Measurement: Counter"},

	{.irq = IRQEXT_CMR, .name = "CMR", .desc = "[EXT] CPU-Measurement: RI"},

	{.irq = IRQEXT_FTP, .name = "FTP", .desc = "[EXT] HMC FTP Service"},

	{.irq = IRQIO_CIO,  .name = "CIO", .desc = "[I/O] Common I/O Layer Interrupt"},

	{.irq = IRQIO_QAI,  .name = "QAI", .desc = "[I/O] QDIO Adapter Interrupt"},

arch/s390/kernel/process.c

+0 −1
Original line number Diff line number Diff line
@@ -171,7 +171,6 @@ int copy_thread(unsigned long clone_flags, unsigned long new_stackp, 


	/* Don't copy runtime instrumentation info */

	p->thread.ri_cb = NULL;

	p->thread.ri_signum = 0;

	frame->childregs.psw.mask &= ~PSW_MASK_RI;



	/* Set a new TLS ?  */