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>
This commit is contained in:
parent
69c1f396f2
commit
5c418dc789
3 changed files with 39 additions and 39 deletions
|
|
@ -1719,19 +1719,19 @@ extern int efi_tpm_eventlog_init(void);
|
|||
* fault happened while executing an efi runtime service.
|
||||
*/
|
||||
enum efi_rts_ids {
|
||||
NONE,
|
||||
GET_TIME,
|
||||
SET_TIME,
|
||||
GET_WAKEUP_TIME,
|
||||
SET_WAKEUP_TIME,
|
||||
GET_VARIABLE,
|
||||
GET_NEXT_VARIABLE,
|
||||
SET_VARIABLE,
|
||||
QUERY_VARIABLE_INFO,
|
||||
GET_NEXT_HIGH_MONO_COUNT,
|
||||
RESET_SYSTEM,
|
||||
UPDATE_CAPSULE,
|
||||
QUERY_CAPSULE_CAPS,
|
||||
EFI_NONE,
|
||||
EFI_GET_TIME,
|
||||
EFI_SET_TIME,
|
||||
EFI_GET_WAKEUP_TIME,
|
||||
EFI_SET_WAKEUP_TIME,
|
||||
EFI_GET_VARIABLE,
|
||||
EFI_GET_NEXT_VARIABLE,
|
||||
EFI_SET_VARIABLE,
|
||||
EFI_QUERY_VARIABLE_INFO,
|
||||
EFI_GET_NEXT_HIGH_MONO_COUNT,
|
||||
EFI_RESET_SYSTEM,
|
||||
EFI_UPDATE_CAPSULE,
|
||||
EFI_QUERY_CAPSULE_CAPS,
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue