diff --git a/.pick_status.json b/.pick_status.json
index 3eda8f9d066..c7a39b8ce59 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -58,7 +58,7 @@
         "description": "llvmpipe: Use uintptr_t for pointer values",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "264663d55d321225a4962073ce4b7389d3d42287"
     },
diff --git a/src/gallium/drivers/llvmpipe/lp_state_cs.c b/src/gallium/drivers/llvmpipe/lp_state_cs.c
index 92e156b4111..b57e1068a06 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_cs.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_cs.c
@@ -1304,12 +1304,12 @@ llvmpipe_set_global_binding(struct pipe_context *pipe,
    }
 
    for (i = 0; i < count; i++) {
-      uint64_t va;
+      uintptr_t va;
       uint32_t offset;
       pipe_resource_reference(&cs->global_buffers[first + i], resources[i]);
       struct llvmpipe_resource *lp_res = llvmpipe_resource(resources[i]);
       offset = *handles[i];
-      va = (uint64_t)((char *)lp_res->data + offset);
+      va = (uintptr_t)((char *)lp_res->data + offset);
       memcpy(handles[i], &va, sizeof(va));
    }
 }