asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

arm64: efi: Switch to static_assert wrapper

Browse source 
The backported commit 96bc083042 switched
static_assert to _Static_assert compared to the upstream commit, which
causes the following error when building with -Werror:

arch/arm64/kernel/efi.c:157:36: error: '_Static_assert' with no message
is a C2x extension [-Werror,-Wc2x-extensions]
_Static_assert(THREAD_SIZE >= SZ_8K);
                                   ^
                                   , ""
1 error generated.

Switch back to static_assert after picking the required upstream commit
6bab69c65013bed5fce9f101a64a84d0385b3946
"build_bug.h: add wrapper for _Static_assert"

Fixes: 96bc083042 ("BACKPORT: arm64: efi: Execute runtime services
       from a dedicated stack")
Signed-off-by: Michael Bestas <mkbestas@lineageos.org>
Change-Id: I74ff73517c49792d73f9bd4189ef73aec6addee0
This commit is contained in:
Michael Bestas 2024-01-06 18:36:02 +02:00
parent bee00a7b7a
commit 82df9edfd5
No known key found for this signature in database
GPG key ID: CC95044519BE6669
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm64/kernel/efi.c
View file

@ -154,7 +154,7 @@ DEFINE_SPINLOCK(efi_rt_lock);
asmlinkage u64 *efi_rt_stack_top __ro_after_init;
/* EFI requires 8 KiB of stack space for runtime services */
_Static_assert(THREAD_SIZE >= SZ_8K);
static_assert(THREAD_SIZE >= SZ_8K);
static int __init arm64_efi_rt_init(void)
{