From: Simon Glass <sjg@chromium.org>
Date: Wed, 4 Nov 2020 16:57:14 +0000 (-0700)
Subject: Add an assembly guard around linux/bitops.h
X-Git-Tag: v2021.10~443^2~45
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1779b8a96a32706dc8e2e71187889b38d9822443;p=platform%2Fkernel%2Fu-boot.git

Add an assembly guard around linux/bitops.h

This file can be included by any header but it includes C code. Guard it
to avoid errors when compiling ASL, etc.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
---

diff --git a/include/linux/bitops.h b/include/linux/bitops.h
index 6b509dce58..16f28993f5 100644
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
@@ -1,7 +1,7 @@
 #ifndef _LINUX_BITOPS_H
 #define _LINUX_BITOPS_H
 
-#ifndef USE_HOSTCC
+#if !defined(USE_HOSTCC) && !defined(__ASSEMBLY__)
 
 #include <asm/types.h>
 #include <asm-generic/bitsperlong.h>
@@ -218,6 +218,6 @@ static inline void generic_clear_bit(int nr, volatile unsigned long *addr)
 	*p &= ~mask;
 }
 
-#endif /* !USE_HOSTCC */
+#endif /* !USE_HOSTCC && !__ASSEMBLY__ */
 
 #endif