efi: Fix build error due to enum collision between efi.h and ima.h
The following commit: a893ea15d764 ("tpm: move tpm_chip definition to include/linux/tpm.h") introduced a build error when both IMA and EFI are enabled: In file included from ../security/integrity/ima/ima_fs.c:30: ../security/integrity/ima/ima.h:176:7: error: redeclaration of enumerator "NONE" What happens is that both headers (ima.h and efi.h) defines the same 'NONE' constant, and it broke when they started getting included from the same file: Rework to prefix the EFI enum with 'EFI_*'. Signed-off-by: Anders Roxell <anders.roxell@linaro.org> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/20190215165551.12220-2-ard.biesheuvel@linaro.org [ Cleaned up the changelog a bit. ] Signed-off-by: Ingo Molnar <mingo@kernel.org>
Этот коммит содержится в:

коммит произвёл
Ingo Molnar

родитель
69c1f396f2
Коммит
5c418dc789
@@ -717,7 +717,7 @@ void efi_recover_from_page_fault(unsigned long phys_addr)
|
||||
* "efi_mm" cannot be used to check if the page fault had occurred
|
||||
* in the firmware context because efi=old_map doesn't use efi_pgd.
|
||||
*/
|
||||
if (efi_rts_work.efi_rts_id == NONE)
|
||||
if (efi_rts_work.efi_rts_id == EFI_NONE)
|
||||
return;
|
||||
|
||||
/*
|
||||
@@ -742,7 +742,7 @@ void efi_recover_from_page_fault(unsigned long phys_addr)
|
||||
* because this case occurs *very* rarely and hence could be improved
|
||||
* on a need by basis.
|
||||
*/
|
||||
if (efi_rts_work.efi_rts_id == RESET_SYSTEM) {
|
||||
if (efi_rts_work.efi_rts_id == EFI_RESET_SYSTEM) {
|
||||
pr_info("efi_reset_system() buggy! Reboot through BIOS\n");
|
||||
machine_real_restart(MRR_BIOS);
|
||||
return;
|
||||
|
Ссылка в новой задаче
Block a user