Commit a526a130 authored by Zhao Yihan's avatar Zhao Yihan Committed by guzitao
Browse files

sw64: fix a compile error with CONFIG_EFI=n 

Sunway inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I56QAM



--------------------------------

Signed-off-by: default avatarZhao Yihan <zhaoyihan@wxiat.com>
Reviewed-by: default avatarHe Sheng <hesheng@wxiat.com>
Signed-off-by: default avatarGu Zitao <guzitao@wxiat.com>
parent c6ea2f56

arch/sw_64/include/asm/efi.h

+4 −4
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ 
#include <asm/early_ioremap.h>

#ifdef CONFIG_EFI

extern void efi_init(void);

extern unsigned long entSuspend;



#define SLEEP_ENTRY_GUID        EFI_GUID(0x59cb76bb, 0x9c3a, 0x4c8f, 0xbd, 0x5c, 0xc0, 0x0f, 0x20, 0x61, 0x18, 0x4b)



#else

#define efi_init()

#define efi_idmap_init()
@@ -35,8 +39,4 @@ extern void efi_init(void); 


#define efi_call_early(f, ...) sys_table_arg->boottime->f(__VA_ARGS__)



extern unsigned long entSuspend;



#define SLEEP_ENTRY_GUID	EFI_GUID(0x59cb76bb, 0x9c3a, 0x4c8f, 0xbd, 0x5c, 0xc0, 0x0f, 0x20, 0x61, 0x18, 0x4b)



#endif /* _ASM_SW64_EFI_H */

arch/sw_64/kernel/traps.c

+2 −0
Original line number Diff line number Diff line
@@ -1459,5 +1459,7 @@ trap_init(void) 
	wrent(entIF, 3);

	wrent(entUna, 4);

	wrent(entSys, 5);

#ifdef CONFIG_EFI

	wrent((void *)entSuspend, 6);

#endif

}