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

Commit b8e660b8 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[S390] Replace ENOTSUPP usage with EOPNOTSUPP 



ENOTSUPP is not supposed to leak to userspace so lets just use
EOPNOTSUPP everywhere.
Doesn't fix a bug, but makes future reviews easier.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 59b69787

arch/s390/hypfs/hypfs_diag.c

+2 −2
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ static void *diag204_store(void) 


static int diag224(void *ptr)

{

	int rc = -ENOTSUPP;

	int rc = -EOPNOTSUPP;



	asm volatile(

		"	diag	%1,%2,0x224\n"
@@ -507,7 +507,7 @@ static int diag224_get_name_table(void) 
		return -ENOMEM;

	if (diag224(diag224_cpu_names)) {

		kfree(diag224_cpu_names);

		return -ENOTSUPP;

		return -EOPNOTSUPP;

	}

	EBCASC(diag224_cpu_names + 16, (*diag224_cpu_names + 1) * 16);

	return 0;

arch/s390/kernel/ipl.c

+1 −1
Original line number Diff line number Diff line
@@ -1592,7 +1592,7 @@ static void vmcmd_run(struct shutdown_trigger *trigger) 
static int vmcmd_init(void)

{

	if (!MACHINE_IS_VM)

		return -ENOTSUPP;

		return -EOPNOTSUPP;

	vmcmd_kset = kset_create_and_add("vmcmd", NULL, firmware_kobj);

	if (!vmcmd_kset)

		return -ENOMEM;

arch/s390/kvm/diag.c

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static int __diag_ipl_functions(struct kvm_vcpu *vcpu) 
		vcpu->run->s390_reset_flags = 0;

		break;

	default:

		return -ENOTSUPP;

		return -EOPNOTSUPP;

	}



	atomic_clear_mask(CPUSTAT_RUNNING, &vcpu->arch.sie_block->cpuflags);
@@ -62,6 +62,6 @@ int kvm_s390_handle_diag(struct kvm_vcpu *vcpu) 
	case 0x308:

		return __diag_ipl_functions(vcpu);

	default:

		return -ENOTSUPP;

		return -EOPNOTSUPP;

	}

}

arch/s390/kvm/intercept.c

+9 −9
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ static int handle_lctlg(struct kvm_vcpu *vcpu) 


	vcpu->stat.instruction_lctlg++;

	if ((vcpu->arch.sie_block->ipb & 0xff) != 0x2f)

		return -ENOTSUPP;

		return -EOPNOTSUPP;



	useraddr = disp2;

	if (base2)
@@ -138,7 +138,7 @@ static int handle_stop(struct kvm_vcpu *vcpu) 
		rc = __kvm_s390_vcpu_store_status(vcpu,

						  KVM_S390_STORE_STATUS_NOADDR);

		if (rc >= 0)

			rc = -ENOTSUPP;

			rc = -EOPNOTSUPP;

	}



	if (vcpu->arch.local_int.action_bits & ACTION_RELOADVCPU_ON_STOP) {
@@ -150,7 +150,7 @@ static int handle_stop(struct kvm_vcpu *vcpu) 
	if (vcpu->arch.local_int.action_bits & ACTION_STOP_ON_STOP) {

		vcpu->arch.local_int.action_bits &= ~ACTION_STOP_ON_STOP;

		VCPU_EVENT(vcpu, 3, "%s", "cpu stopped");

		rc = -ENOTSUPP;

		rc = -EOPNOTSUPP;

	}



	spin_unlock_bh(&vcpu->arch.local_int.lock);
@@ -171,9 +171,9 @@ static int handle_validity(struct kvm_vcpu *vcpu) 
			 2*PAGE_SIZE);

		if (rc)

			/* user will receive sigsegv, exit to user */

			rc = -ENOTSUPP;

			rc = -EOPNOTSUPP;

	} else

		rc = -ENOTSUPP;

		rc = -EOPNOTSUPP;



	if (rc)

		VCPU_EVENT(vcpu, 2, "unhandled validity intercept code %d",
@@ -189,7 +189,7 @@ static int handle_instruction(struct kvm_vcpu *vcpu) 
	handler = instruction_handlers[vcpu->arch.sie_block->ipa >> 8];

	if (handler)

		return handler(vcpu);

	return -ENOTSUPP;

	return -EOPNOTSUPP;

}



static int handle_prog(struct kvm_vcpu *vcpu)
@@ -206,7 +206,7 @@ static int handle_instruction_and_prog(struct kvm_vcpu *vcpu) 
	rc = handle_instruction(vcpu);

	rc2 = handle_prog(vcpu);



	if (rc == -ENOTSUPP)

	if (rc == -EOPNOTSUPP)

		vcpu->arch.sie_block->icptcode = 0x04;

	if (rc)

		return rc;
@@ -231,9 +231,9 @@ int kvm_handle_sie_intercept(struct kvm_vcpu *vcpu) 
	u8 code = vcpu->arch.sie_block->icptcode;



	if (code & 3 || (code >> 2) >= ARRAY_SIZE(intercept_funcs))

		return -ENOTSUPP;

		return -EOPNOTSUPP;

	func = intercept_funcs[code >> 2];

	if (func)

		return func(vcpu);

	return -ENOTSUPP;

	return -EOPNOTSUPP;

}

arch/s390/kvm/interrupt.c

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ int kvm_s390_handle_wait(struct kvm_vcpu *vcpu) 
	if (psw_interrupts_disabled(vcpu)) {

		VCPU_EVENT(vcpu, 3, "%s", "disabled wait");

		__unset_cpu_idle(vcpu);

		return -ENOTSUPP; /* disabled wait */

		return -EOPNOTSUPP; /* disabled wait */

	}



	if (psw_extint_disabled(vcpu) ||