|
|
|
|
|
|
|
|
|
|
xen-devel
[Xen-devel] [Patch]: conflicting sysctl numbers
Attached patch fixes the problem.
Kamble, Nitin A wrote:
> Keir,
>
>
>
> I found there are two sysctls with conflicting same sysctl no in the
> code. This looks like a issue caused by merging code from different
> developers, and need fixing.
>
> xen/include/public/sysctl.h
>
> #define XEN_SYSCTL_cpu_hotplug 11
>
> #define XEN_SYSCTL_lockprof_op 11
>
>
> Looks like this has come from changeset 20312:
>
> Spinlock profiling (enable in build with lock_profile=y)
--
Juergen Gross Principal Developer Operating Systems
TSP ES&S SWE OS6 Telephone: +49 (0) 89 3222 2967
Fujitsu Technolgy Solutions e-mail: juergen.gross@xxxxxxxxxxxxxx
Domagkstr. 28 Internet: ts.fujitsu.com
D-80807 Muenchen Company details: ts.fujitsu.com/imprint.html
# HG changeset patch
# User juergen.gross@xxxxxxxxxxxxxx
# Date 1259649761 -3600
# Node ID b8915cc97db6189b1146e692c70cc1ea62baf776
# Parent abc6183f486e66b5721dbf0313ee0d3460613a99
Signed-off-by: juergen.gross@xxxxxxxxxxxxxx
use free sysctl_op number
diff -r abc6183f486e -r b8915cc97db6 xen/include/public/sysctl.h
--- a/xen/include/public/sysctl.h Mon Nov 30 10:58:23 2009 +0000
+++ b/xen/include/public/sysctl.h Tue Dec 01 07:42:41 2009 +0100
@@ -454,7 +454,7 @@
#define PG_OFFLINE_OWNER_SHIFT 16
-#define XEN_SYSCTL_lockprof_op 11
+#define XEN_SYSCTL_lockprof_op 15
/* Sub-operations: */
#define XEN_SYSCTL_LOCKPROF_reset 1 /* Reset all profile data to zero. */
#define XEN_SYSCTL_LOCKPROF_query 2 /* Get lock profile information. */
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
|
|
|
|