aboutsummaryrefslogtreecommitdiff
path: root/tools/perf/scripts/python/export-to-sqlite.py
diff options
context:
space:
mode:
authorAnders Roxell <[email protected]>2019-02-15 17:55:51 +0100
committerIngo Molnar <[email protected]>2019-02-16 12:18:55 +0100
commit5c418dc789a3898717ebf2caa5716ba91a7150b2 (patch)
treea89dc3170a533b2544259891f845e65c498c274a /tools/perf/scripts/python/export-to-sqlite.py
parent69c1f396f25b805aeff08f06d2e992c315ee5b1e (diff)
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 <[email protected]> Signed-off-by: Ard Biesheuvel <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: [email protected] Link: http://lkml.kernel.org/r/[email protected] [ Cleaned up the changelog a bit. ] Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python/export-to-sqlite.py')
0 files changed, 0 insertions, 0 deletions