[PATCH v3 44/57] x86: Correct the assembly guard in e820.h

2020-09-06 Thread Simon Glass
This is currently in the wrong place, so including the file in the device
tree fails. Fix it.

Signed-off-by: Simon Glass 
---

(no changes since v1)

Changes in v1:
- Update commit message with a comma

 arch/x86/include/asm/e820.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h
index 9d29f82f972..87af0f492ec 100644
--- a/arch/x86/include/asm/e820.h
+++ b/arch/x86/include/asm/e820.h
@@ -21,10 +21,9 @@ struct e820_entry {
 #define ISA_START_ADDRESS  0xa
 #define ISA_END_ADDRESS0x10
 
-#endif /* __ASSEMBLY__ */
-
 /* Implementation defined function to install an e820 map */
 unsigned int install_e820_map(unsigned int max_entries,
  struct e820_entry *);
+#endif /* __ASSEMBLY__ */
 
 #endif /* _ASM_X86_E820_H */
-- 
2.28.0.526.ge36021eeef-goog



Re: [PATCH v3 44/57] x86: Correct the assembly guard in e820.h

2020-09-22 Thread Bin Meng
On Mon, Sep 7, 2020 at 5:44 AM Simon Glass  wrote:
>
> This is currently in the wrong place, so including the file in the device
> tree fails. Fix it.
>
> Signed-off-by: Simon Glass 
> ---
>
> (no changes since v1)
>
> Changes in v1:
> - Update commit message with a comma
>
>  arch/x86/include/asm/e820.h | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>

Reviewed-by: Bin Meng