Skip to contentSkip to conversation

conflicting sysctl numbers

PATCH New Kamble, Nitin A 3 participants 3 messages Dec 1, 2009

lore
Share & tools
lore
#0 lore raw

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)

Adds new tool xenlockprof to run from dom0.

From: Juergen Gross <[email protected]<mailto:[email protected]>>

Thanks & Regards,
Nitin
Linux Open Source Technology Center, Intel Corporation
------------------------------------------------------

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#1 lore raw

PATCH 1/1 : conflicting sysctl numbers

Attached patch fixes the problem.

Quoted 18 lines · Nitin A

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)

Signature · 5 lines
Juergen Gross                 Principal Developer Operating Systems
TSP ES&S SWE OS6                       Telephone: +49 (0) 89 3222 2967
Fujitsu Technolgy Solutions               e-mail: [email protected]
Domagkstr. 28                           Internet: ts.fujitsu.com
D-80807 Muenchen                 Company details: ts.fujitsu.com/imprint.html

# HG changeset patch
# User [email protected]
# Date 1259649761 -3600
# Node ID b8915cc97db6189b1146e692c70cc1ea62baf776 # Parent abc6183f486e66b5721dbf0313ee0d3460613a99

Signed-off-by [email protected]

use free sysctl_op number

xen/include/public/sysctl.h +1 -1
diff -r abc6183f486e -r b8915cc97db6 xen/include/public/sysctl.h
@@ -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
[email protected]
http://lists.xensource.com/xen-devel

#2 lore raw
In reply to Kamble, Nitin A

Thanks Nitin, I'll fix it.

K.

Quoted 29 lines · Nitin A

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)

Adds new tool xenlockprof to run from dom0.

From: Juergen Gross <[email protected]>

Thanks & Regards,
Nitin
Linux Open Source Technology Center, Intel Corporation
------------------------------------------------------