From: Juergen Gross <jgross@suse.com>
Date: Wed, 23 Aug 2017 17:34:00 +0000 (+0200)
Subject: xen/arch/x86/oprofile/nmi_int.c: let custom parameter parsing routines return errno
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~1588
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a8297bc483a6c72a3ab491749664510c4467e741;p=xen.git

xen/arch/x86/oprofile/nmi_int.c: let custom parameter parsing routines return errno

Modify the custom parameter parsing routines in:

xen/arch/x86/oprofile/nmi_int.c

to indicate whether the parameter value was parsed successfully.

Signed-off-by: Juergen Gross <jgross@suse.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/xen/arch/x86/oprofile/nmi_int.c b/xen/arch/x86/oprofile/nmi_int.c
index 126f7a8d9f..84ba108fdb 100644
--- a/xen/arch/x86/oprofile/nmi_int.c
+++ b/xen/arch/x86/oprofile/nmi_int.c
@@ -323,12 +323,15 @@ static int __init p4_init(char ** cpu_type)
 
 
 static int force_arch_perfmon;
+
 static int force_cpu_type(const char *str)
 {
 	if (!strcmp(str, "arch_perfmon")) {
 		force_arch_perfmon = 1;
 		printk(KERN_INFO "oprofile: forcing architectural perfmon\n");
 	}
+	else
+		return -EINVAL;
 
 	return 0;
 }