From mboxrd@z Thu Jan  1 00:00:00 1970
From: Juergen Gross <juergen.gross@ts.fujitsu.com>
Subject: [Patch]: conflicting sysctl numbers
Date: Tue, 01 Dec 2009 07:46:10 +0100
Message-ID: <4B14BBB2.605@ts.fujitsu.com>
References: <8EA2C2C4116BF44AB370468FBF85A777010FC16205@orsmsx504.amr.corp.intel.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------060903060405090607040707"
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <8EA2C2C4116BF44AB370468FBF85A777010FC16205@orsmsx504.amr.corp.intel.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: "Kamble, Nitin A" <nitin.a.kamble@intel.com>
Cc: "xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>, Keir Fraser <Keir.Fraser@eu.citrix.com>
List-Id: xen-devel@lists.xenproject.org

This is a multi-part message in MIME format.
--------------060903060405090607040707
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

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

--------------060903060405090607040707
Content-Type: text/x-patch;
 name="sysctl.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="sysctl.patch"

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

--------------060903060405090607040707
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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

--------------060903060405090607040707--