summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Stone <jistone@redhat.com>2010-04-13 20:07:16 -0700
committerJosh Stone <jistone@redhat.com>2010-04-13 20:07:16 -0700
commitdb55e0298beffc96d2d928053fd0573189bbe58d (patch)
tree081038b4062c438ade46572ffae39ac05ff30083
parent17c0b69c7725db3c10e47b6fde7b9066588932d4 (diff)
downloadsystemtap-steved-db55e0298beffc96d2d928053fd0573189bbe58d.tar.gz
systemtap-steved-db55e0298beffc96d2d928053fd0573189bbe58d.tar.xz
systemtap-steved-db55e0298beffc96d2d928053fd0573189bbe58d.zip
Fix [set_]kernel_pointer for 32-bitHEADmaster
* tapset/conversions.stp (kernel_pointer): Use uintptr_t casts. * tapset/conversions-guru.stp (set_kernel_pointer): Ditto.
-rw-r--r--tapset/conversions-guru.stp2
-rw-r--r--tapset/conversions.stp2
2 files changed, 2 insertions, 2 deletions
diff --git a/tapset/conversions-guru.stp b/tapset/conversions-guru.stp
index 9d662ce3..e92ea4ce 100644
--- a/tapset/conversions-guru.stp
+++ b/tapset/conversions-guru.stp
@@ -125,7 +125,7 @@ deref_fault: /* branched to from kwrite() */
* Reports an error when writing to the given address fails.
*/
function set_kernel_pointer (addr:long, val:long) %{ /* guru */
- kwrite((void **) (intptr_t) THIS->addr, THIS->val);
+ kwrite((void **) (uintptr_t) THIS->addr, (uintptr_t)THIS->val);
if (0) {
deref_fault: /* branched to from kwrite() */
snprintf (CONTEXT->error_buffer, sizeof(CONTEXT->error_buffer),
diff --git a/tapset/conversions.stp b/tapset/conversions.stp
index 8d8be9f4..38eda207 100644
--- a/tapset/conversions.stp
+++ b/tapset/conversions.stp
@@ -122,7 +122,7 @@ deref_fault: /* branched to from kread() */
* fails.
*/
function kernel_pointer:long (addr:long) %{ /* pure */
- THIS->__retvalue = (int64_t) kread((void **) (intptr_t) THIS->addr);
+ THIS->__retvalue = (uintptr_t) kread((void **) (uintptr_t) THIS->addr);
if (0) {
deref_fault: /* branched to from kread() */
snprintf (CONTEXT->error_buffer, sizeof(CONTEXT->error_buffer),