From: Sven Van Asbroeck <thesven73@gmail.com>
Date: Tue, 13 Apr 2021 14:45:47 +0000 (-0400)
Subject: rust: helpers: remove guard for rust-bindgen bug
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b5a88a29a363bf25cee3cf9dbe1f3b6695cdb807;p=users%2Fjedix%2Flinux-maple.git

rust: helpers: remove guard for rust-bindgen bug

On 32-bit arm, `size_t` and 'uintptr_t` are incompatible,
which will trigger the static assertion.

The bug which this guard protects against
(https://github.com/rust-lang/rust-bindgen/issues/1671)
was fixed upstream as of rust-bindgen v0.53:
https://github.com/rust-lang/rust-bindgen/pull/1688
d650823839f7 ("Remove size_t to usize conversion")

The current recommended rust-bindgen version for building
the Linux kernel is v0.56, so the guard can be safely
dropped.

Out of an abundance of caution, remove the guard only
if building for 32-bit arm.

Signed-off-by: Sven Van Asbroeck <thesven73@gmail.com>
[normalized title]
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
---

diff --git a/rust/helpers.c b/rust/helpers.c
index 4cae8c27f8f92..133fe9119990f 100644
--- a/rust/helpers.c
+++ b/rust/helpers.c
@@ -81,6 +81,8 @@ void rust_helper_kunmap(struct page *page)
 }
 EXPORT_SYMBOL_GPL(rust_helper_kunmap);
 
+#if !defined(CONFIG_ARM)
 // See https://github.com/rust-lang/rust-bindgen/issues/1671
 static_assert(__builtin_types_compatible_p(size_t, uintptr_t),
 	"size_t must match uintptr_t, what architecture is this??");
+#endif