[PATCH] efi/x86: Set the PE/COFF header's NX compat flag unconditionally

[PATCH] efi/x86: Set the PE/COFF header's NX compat flag unconditionally

[Ard Biesheuvel]

From: Ard Biesheuvel <ardb@kernel.org>

Now that we use the proper section and file alignment, and invoke the
EFI memory attributes protocol to manage executable permissions where
needed, we can set the NX compat flag unconditionally.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
 arch/x86/boot/header.S | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
index b2771710ed98..34963501a2c5 100644
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
@@ -112,11 +112,7 @@ extra_header_fields:
 	.long	salign				# SizeOfHeaders
 	.long	0				# CheckSum
 	.word	IMAGE_SUBSYSTEM_EFI_APPLICATION	# Subsystem (EFI application)
-#ifdef CONFIG_EFI_DXE_MEM_ATTRIBUTES
 	.word	IMAGE_DLL_CHARACTERISTICS_NX_COMPAT	# DllCharacteristics
-#else
-	.word	0				# DllCharacteristics
-#endif
 #ifdef CONFIG_X86_32
 	.long	0				# SizeOfStackReserve
 	.long	0				# SizeOfStackCommit
-- 
2.43.0.275.g3460e3d667-goog