diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-03-16 23:09:26 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-03-16 23:09:26 +0000 |
| commit | 26eea58be0a78ea40b0ba18ba0dfd6ba470313b6 (patch) | |
| tree | 0b0fcef0fbc1d1fa061e8ea90ed976414b341900 /libdwfl/linux-kernel-modules.c | |
| parent | 700b2efec5ca61f6a1c6859dd54cef773449eaac (diff) | |
| parent | 76a46f02a97f7d0d8ee334e1fbdb981757a7f50c (diff) | |
| download | platform_external_elfutils-android10-s3-release.tar.gz platform_external_elfutils-android10-s3-release.tar.bz2 platform_external_elfutils-android10-s3-release.zip | |
Snap for 5381581 from 76a46f02a97f7d0d8ee334e1fbdb981757a7f50c to qt-releaseandroid-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r1android-q-preview-6android-q-preview-5android-q-preview-4android-mainline-10.0.0_r3android-mainline-10.0.0_r2android-mainline-10.0.0_r1android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-tests-releaseandroid10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-releaseandroid10-mainline-releaseandroid10-mainline-a-releaseandroid10-gsi
Change-Id: I6bcb41ced4cc380e88825e35e16d68c9500579e1
Diffstat (limited to 'libdwfl/linux-kernel-modules.c')
| -rw-r--r-- | libdwfl/linux-kernel-modules.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c index 360e4ee9..d46ab5aa 100644 --- a/libdwfl/linux-kernel-modules.c +++ b/libdwfl/linux-kernel-modules.c @@ -493,14 +493,14 @@ intuit_kernel_bounds (Dwarf_Addr *start, Dwarf_Addr *end, Dwarf_Addr *notes) { struct read_address_state state = { NULL, NULL, 0, 0, NULL, NULL }; + *notes = 0; + state.f = fopen (KSYMSFILE, "r"); if (state.f == NULL) return errno; (void) __fsetlocking (state.f, FSETLOCKING_BYCALLER); - *notes = 0; - int result; do result = read_address (&state, start) ? 0 : -1; @@ -695,9 +695,6 @@ dwfl_linux_kernel_report_kernel (Dwfl *dwfl) /* Try to figure out the bounds of the kernel image without looking for any vmlinux file. */ Dwarf_Addr notes; - /* The compiler cannot deduce that if intuit_kernel_bounds returns - zero NOTES will be initialized. Fake the initialization. */ - asm ("" : "=m" (notes)); int result = intuit_kernel_bounds (&start, &end, ¬es); if (result == 0) { |