diff --git a/.pick_status.json b/.pick_status.json
index 11afd70f198..e8e6237a312 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1234,7 +1234,7 @@
         "description": "amd,compiler: fix const errors found with C23 glibc support",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/amd/vulkan/radv_debug.c b/src/amd/vulkan/radv_debug.c
index 842bca2a7c3..40a1aaf7ceb 100644
--- a/src/amd/vulkan/radv_debug.c
+++ b/src/amd/vulkan/radv_debug.c
@@ -388,8 +388,8 @@ static void
 radv_add_split_disasm(const char *disasm, uint64_t start_addr, unsigned *num, struct radv_shader_inst *instructions)
 {
    struct radv_shader_inst *last_inst = *num ? &instructions[*num - 1] : NULL;
-   char *next;
-   char *repeat = strstr(disasm, "then repeated");
+   const char *next;
+   const char *repeat = strstr(disasm, "then repeated");
 
    while ((next = strchr(disasm, '\n'))) {
       struct radv_shader_inst *inst = &instructions[*num];