From: Juergen Gross <juergen.gross@ts.fujitsu.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>
Subject: [Patch]: conflicting sysctl numbers
Date: Tue, 01 Dec 2009 07:46:10 +0100 [thread overview]
Message-ID: <4B14BBB2.605@ts.fujitsu.com> (raw)
In-Reply-To: <8EA2C2C4116BF44AB370468FBF85A777010FC16205@orsmsx504.amr.corp.intel.com>
[-- 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
next prev parent reply other threads:[~2009-12-01 6:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-01 1:41 conflicting sysctl numbers Kamble, Nitin A
2009-12-01 6:46 ` Juergen Gross [this message]
2009-12-01 7:20 ` Keir Fraser
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4B14BBB2.605@ts.fujitsu.com \
--to=juergen.gross@ts.fujitsu.com \
--cc=Keir.Fraser@eu.citrix.com \
--cc=nitin.a.kamble@intel.com \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.