mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-02 16:44:10 +08:00
5c418dc789
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>
|
||
|---|---|---|
| .. | ||
| libstub | ||
| test | ||
| apple-properties.c | ||
| arm-init.c | ||
| arm-runtime.c | ||
| capsule-loader.c | ||
| capsule.c | ||
| cper-arm.c | ||
| cper-x86.c | ||
| cper.c | ||
| dev-path-parser.c | ||
| earlycon.c | ||
| efi-bgrt.c | ||
| efi-pstore.c | ||
| efi.c | ||
| efibc.c | ||
| efivars.c | ||
| esrt.c | ||
| fake_mem.c | ||
| Kconfig | ||
| Makefile | ||
| memattr.c | ||
| memmap.c | ||
| reboot.c | ||
| runtime-map.c | ||
| runtime-wrappers.c | ||
| tpm.c | ||
| vars.c | ||