Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 22 Apr 2023 10:44:53 GMT
From:      Vladimir Kondratyev <wulf@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 06c844e175ed - main - LinuxKPI: Fix building on 32bit archs
Message-ID:  <202304221044.33MAirTg044798@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by wulf:

URL: https://cgit.FreeBSD.org/src/commit/?id=06c844e175ed5dbad96a1a84b3fdb74c03626900

commit 06c844e175ed5dbad96a1a84b3fdb74c03626900
Author:     Vladimir Kondratyev <wulf@FreeBSD.org>
AuthorDate: 2023-04-22 10:24:40 +0000
Commit:     Vladimir Kondratyev <wulf@FreeBSD.org>
CommitDate: 2023-04-22 10:25:49 +0000

    LinuxKPI: Fix building on 32bit archs
    
    Reported by:    Jenkins
    Fixes:  e5cf9deb61fd ("LinuxKPI: Add bitmap_to_arr32() to <linux/bitmap.h>")
---
 sys/compat/linuxkpi/common/include/linux/bitmap.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/compat/linuxkpi/common/include/linux/bitmap.h b/sys/compat/linuxkpi/common/include/linux/bitmap.h
index 4e156377cdaf..98e13dbb55d3 100644
--- a/sys/compat/linuxkpi/common/include/linux/bitmap.h
+++ b/sys/compat/linuxkpi/common/include/linux/bitmap.h
@@ -302,7 +302,7 @@ bitmap_to_arr32(uint32_t *dst, const unsigned long *src, unsigned int size)
 		src++;
 	}
 #else
-	bitmap_copy(dst, src, size);
+	bitmap_copy((unsigned long *)dst, src, size);
 #endif
 	if ((size % 32) != 0) /* Linux uses BITS_PER_LONG. Seems to be a bug */
 		dst[end - 1] &= (uint32_t)(UINT_MAX >> (32 - (size % 32)));



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304221044.33MAirTg044798>