conflicting sysctl numbers

conflicting sysctl numbers

[Kamble, Nitin A]

[-- Attachment #1.1: Type: text/plain, Size: 774 bytes --]

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 <juergen.gross@ts.fujitsu.com<mailto:juergen.gross@ts.fujitsu.com>>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com<mailto:keir.fraser@citrix.com>>


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


[-- Attachment #1.2: Type: text/html, Size: 5705 bytes --]

[-- Attachment #2: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

[Patch]: conflicting sysctl numbers

[Juergen Gross]

[-- Attachment #1: Type: text/plain, Size: 856 bytes --]

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@ts.fujitsu.com
Domagkstr. 28                           Internet: ts.fujitsu.com
D-80807 Muenchen                 Company details: ts.fujitsu.com/imprint.html

[-- Attachment #2: sysctl.patch --]
[-- Type: text/x-patch, Size: 767 bytes --]

# HG changeset patch
# User juergen.gross@ts.fujitsu.com
# Date 1259649761 -3600
# Node ID b8915cc97db6189b1146e692c70cc1ea62baf776
# Parent  abc6183f486e66b5721dbf0313ee0d3460613a99

Signed-off-by: juergen.gross@ts.fujitsu.com

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. */

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Re: conflicting sysctl numbers

[Keir Fraser]

Thanks Nitin, I'll fix it.

 K.

On 01/12/2009 01:41, "Kamble, Nitin A" <nitin.a.kamble@intel.com> 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)
>  
> Adds new tool xenlockprof to run from dom0.
>  
> From: Juergen Gross <juergen.gross@ts.fujitsu.com>
> Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
>  
>  
> Thanks & Regards,
> Nitin
> Linux Open Source Technology Center, Intel Corporation
> ------------------------------------------------------
>  
>