From f27aa67c0f6fd848d5269f1a699af546d76dab3e Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Sun, 25 Aug 2024 20:20:06 -0700 Subject: [PATCH] build-llvm.py: Use latest mainline tag for profiling Signed-off-by: Nathan Chancellor --- build-llvm.py | 2 +- ...d28ec0095c6db0a24fd8bb8fe280c65446cd.patch | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 src/2007d28ec0095c6db0a24fd8bb8fe280c65446cd.patch diff --git a/build-llvm.py b/build-llvm.py index 6d2b010c..63b0c3c9 100755 --- a/build-llvm.py +++ b/build-llvm.py @@ -444,7 +444,7 @@ f"Supplied kernel source version ('{found_version}') is older than the minimum required version ('{minimum_version}'), provide a newer version!" ) else: - lsm.location = Path(src_folder, 'linux-6.11') + lsm.location = Path(src_folder, 'linux-6.12-rc1') lsm.patches = list(src_folder.glob('*.patch')) lsm.tarball.base_download_url = 'https://git.kernel.org/torvalds/t' diff --git a/src/2007d28ec0095c6db0a24fd8bb8fe280c65446cd.patch b/src/2007d28ec0095c6db0a24fd8bb8fe280c65446cd.patch new file mode 100644 index 00000000..e631304e --- /dev/null +++ b/src/2007d28ec0095c6db0a24fd8bb8fe280c65446cd.patch @@ -0,0 +1,40 @@ +From 2007d28ec0095c6db0a24fd8bb8fe280c65446cd Mon Sep 17 00:00:00 2001 +From: Guenter Roeck +Date: Sun, 29 Sep 2024 17:39:02 -0700 +Subject: bcachefs: rename version -> bversion for big endian builds + +Builds on big endian systems fail as follows. + +fs/bcachefs/bkey.h: In function 'bch2_bkey_format_add_key': +fs/bcachefs/bkey.h:557:41: error: + 'const struct bkey' has no member named 'bversion' + +The original commit only renamed the variable for little endian builds. +Rename it for big endian builds as well to fix the problem. + +Fixes: cf49f8a8c277 ("bcachefs: rename version -> bversion") +Cc: Kent Overstreet +Signed-off-by: Guenter Roeck +Signed-off-by: Kent Overstreet +--- +Link: https://evilpiepirate.org/git/bcachefs.git/patch/?id=2007d28ec0095c6db0a24fd8bb8fe280c65446cd +--- + fs/bcachefs/bcachefs_format.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/bcachefs/bcachefs_format.h b/fs/bcachefs/bcachefs_format.h +index 203ee627cab5..84832c2d4df9 100644 +--- a/fs/bcachefs/bcachefs_format.h ++++ b/fs/bcachefs/bcachefs_format.h +@@ -223,7 +223,7 @@ struct bkey { + #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ + struct bpos p; + __u32 size; /* extent size, in sectors */ +- struct bversion version; ++ struct bversion bversion; + + __u8 pad[1]; + #endif +-- +cgit v1.2.3 +