diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2014-02-14 11:11:18 -0800 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-02-14 11:11:18 -0800 |
commit | 31fce91e7afc25c666276f65f019bc13fd27e216 (patch) | |
tree | 24f9673614a98a06fd8f4254c63b306dddd5aac6 /tools/perf/util/event.h | |
parent | 4640c7ee9b8953237d05a61ea3ea93981d1bc961 (diff) | |
parent | 09503379dc99535b1bbfa51aa1aeef340f5d82ec (diff) | |
download | op-kernel-dev-31fce91e7afc25c666276f65f019bc13fd27e216.zip op-kernel-dev-31fce91e7afc25c666276f65f019bc13fd27e216.tar.gz |
Merge remote-tracking branch 'efi/urgent' into x86/urgent
There have been reports of EFI crashes since -rc1. The following two
commits fix known issues.
* Fix boot failure on 32-bit EFI due to the recent EFI memmap changes
merged during the merge window - Borislav Petkov
* Avoid a crash during efi_bgrt_init() by detecting invalid BGRT
headers based on the 'status' field.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'tools/perf/util/event.h')
-rw-r--r-- | tools/perf/util/event.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h index faf6e21..851fa06 100644 --- a/tools/perf/util/event.h +++ b/tools/perf/util/event.h @@ -214,8 +214,7 @@ int perf_event__synthesize_threads(struct perf_tool *tool, struct machine *machine, bool mmap_data); int perf_event__synthesize_kernel_mmap(struct perf_tool *tool, perf_event__handler_t process, - struct machine *machine, - const char *symbol_name); + struct machine *machine); int perf_event__synthesize_modules(struct perf_tool *tool, perf_event__handler_t process, @@ -279,4 +278,7 @@ size_t perf_event__fprintf_mmap2(union perf_event *event, FILE *fp); size_t perf_event__fprintf_task(union perf_event *event, FILE *fp); size_t perf_event__fprintf(union perf_event *event, FILE *fp); +u64 kallsyms__get_function_start(const char *kallsyms_filename, + const char *symbol_name); + #endif /* __PERF_RECORD_H */ |