4.2.8-ckt13 -stable review patch. If anyone has any objections, please let me know.
---8<------------------------------------------------------------ From: Tim Gardner <tim.gard...@canonical.com> BugLink: http://bugs.launchpad.net/bugs/1592552 This reverts commit 159436d273a248e99f05dcd15f39e2c6bdb02652. Causes an FTBS. tests/vmlinux-kallsyms.c: In function 'test__vmlinux_matches_kallsyms': tests/vmlinux-kallsyms.c:64:6: error: implicit declaration of function '__machine__load_kallsyms' [-Werror=implicit-function-declaration] if (__machine__load_kallsyms(&kallsyms, "/proc/kallsyms", type, true, NULL) <= 0) { ^ tests/vmlinux-kallsyms.c:64:2: error: nested extern declaration of '__machine__load_kallsyms' [-Werror=nested-externs] if (__machine__load_kallsyms(&kallsyms, "/proc/kallsyms", type, true, NULL) <= 0) { ^ cc1: all warnings being treated as errors Signed-off-by: Tim Gardner <tim.gard...@canonical.com> Signed-off-by: Kamal Mostafa <ka...@canonical.com> --- tools/perf/tests/vmlinux-kallsyms.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tools/perf/tests/vmlinux-kallsyms.c b/tools/perf/tests/vmlinux-kallsyms.c index 8de34ea..b34c5fc 100644 --- a/tools/perf/tests/vmlinux-kallsyms.c +++ b/tools/perf/tests/vmlinux-kallsyms.c @@ -54,14 +54,8 @@ int test__vmlinux_matches_kallsyms(void) * Step 3: * * Load and split /proc/kallsyms into multiple maps, one per module. - * Do not use kcore, as this test was designed before kcore support - * and has parts that only make sense if using the non-kcore code. - * XXX: extend it to stress the kcorre code as well, hint: the list - * of modules extracted from /proc/kcore, in its current form, can't - * be compacted against the list of modules found in the "vmlinux" - * code and with the one got from /proc/modules from the "kallsyms" code. */ - if (__machine__load_kallsyms(&kallsyms, "/proc/kallsyms", type, true, NULL) <= 0) { + if (machine__load_kallsyms(&kallsyms, "/proc/kallsyms", type, NULL) <= 0) { pr_debug("dso__load_kallsyms "); goto out; } -- 2.7.4
