Merge remote-tracking branch 'origin/llama-fix-signed-comparison-warning-on-freebsd' into installama

angt · angt · commit 3e6f2b7e289b · 2025-11-26T11:33:29.000Z
diff --git a/src/llama-mmap.cpp b/src/llama-mmap.cpp
@@ -485,7 +485,7 @@ struct llama_mlock::impl {
         if (suggest && getrlimit(RLIMIT_MEMLOCK, &lock_limit)) {
             suggest = false;
         }
-        if (suggest && (lock_limit.rlim_max > lock_limit.rlim_cur + size)) {
+        if (suggest && ((uint64_t)lock_limit.rlim_max > (uint64_t)lock_limit.rlim_cur + size)) {
             suggest = false;
         }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -485,7 +485,7 @@ struct llama_mlock::impl {`
`485`	`485`	`if (suggest && getrlimit(RLIMIT_MEMLOCK, &lock_limit)) {`
`486`	`486`	`suggest = false;`
`487`	`487`	`}`
`488`		`- if (suggest && (lock_limit.rlim_max > lock_limit.rlim_cur + size)) {`
	`488`	`+ if (suggest && ((uint64_t)lock_limit.rlim_max > (uint64_t)lock_limit.rlim_cur + size)) {`
`489`	`489`	`suggest = false;`
`490`	`490`	`}`
`491`	`491`	`#endif`