diff --git a/.pick_status.json b/.pick_status.json
index df921f11772..657bfacf331 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -382,7 +382,7 @@
         "description": "llvmpipe: Fix MSVC warning C4334 (32bit shift cast to 64bit)",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c
index 4d13dd64393..43e543b1d0a 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_fs.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c
@@ -720,7 +720,7 @@ generate_fs_loop(struct gallivm_state *gallivm,
          else
             mask_val = LLVMBuildOr(builder, s_mask, mask_val, "");
 
-         LLVMValueRef mask_in = LLVMBuildAnd(builder, s_mask, lp_build_const_int_vec(gallivm, type, (1 << s)), "");
+         LLVMValueRef mask_in = LLVMBuildAnd(builder, s_mask, lp_build_const_int_vec(gallivm, type, (1ll << s)), "");
          sample_mask_in = LLVMBuildOr(builder, sample_mask_in, mask_in, "");
       }
    } else {