From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcus Granado Subject: [PATCH 3/3] xenoprof: Make the escape code consistent across 32 and 64-bit xen Date: Fri, 20 Jan 2012 18:45:07 +0000 Message-ID: <4F19B633.6090105@citrix.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------040303040105030707040505" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel Cc: George Dunlap List-Id: xen-devel@lists.xenproject.org --------------040303040105030707040505 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit xenoprof: Make the escape code consistent across 32 and 64-bit xen At the moment, the xenoprof escape code is defined as "~0UL". Unfortunately, this expands to 0xffffffff on 32-bit systems and 0xffffffffffffffff on 64-bit systems; with the result that while 32-on-32 and 64-in-64 work fine, 32-on-64 (also known as "compat mode") is broken. This patch makes the definition consistent across architectures. In so doing, it will break old-32-bit-on-new-Xen, and vice versa; but this was seen as an acceptable thing to do. Signed-off-by: Marcus Granado Signed-off-by: George Dunlap diff -r 870db1ebc0df -r bcd2c4f0c502 xen/include/public/xenoprof.h --- a/xen/include/public/xenoprof.h Wed Jan 18 17:39:19 2012 +0000 +++ b/xen/include/public/xenoprof.h Wed Jan 18 17:46:28 2012 +0000 @@ -68,7 +68,7 @@ struct event_log { }; /* PC value that indicates a special code */ -#define XENOPROF_ESCAPE_CODE ~0UL +#define XENOPROF_ESCAPE_CODE (~0ULL) /* Transient events for the xenoprof->oprofile cpu buf */ #define XENOPROF_TRACE_BEGIN 1 --------------040303040105030707040505 Content-Type: text/x-patch; name="xenoprof-64bit-escape-code.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xenoprof-64bit-escape-code.diff" xenoprof: Make the escape code consistent across 32 and 64-bit xen At the moment, the xenoprof escape code is defined as "~0UL". Unfortunately, this expands to 0xffffffff on 32-bit systems and 0xffffffffffffffff on 64-bit systems; with the result that while 32-on-32 and 64-in-64 work fine, 32-on-64 (also known as "compat mode") is broken. This patch makes the definition consistent across architectures. In so doing, it will break old-32-bit-on-new-Xen, and vice versa; but this was seen as an acceptable thing to do. Signed-off-by: Marcus Granado Signed-off-by: George Dunlap diff -r 870db1ebc0df -r bcd2c4f0c502 xen/include/public/xenoprof.h --- a/xen/include/public/xenoprof.h Wed Jan 18 17:39:19 2012 +0000 +++ b/xen/include/public/xenoprof.h Wed Jan 18 17:46:28 2012 +0000 @@ -68,7 +68,7 @@ struct event_log { }; /* PC value that indicates a special code */ -#define XENOPROF_ESCAPE_CODE ~0UL +#define XENOPROF_ESCAPE_CODE (~0ULL) /* Transient events for the xenoprof->oprofile cpu buf */ #define XENOPROF_TRACE_BEGIN 1 --------------040303040105030707040505 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 --------------040303040105030707040505--