Pull tracing fixes from Steven Rostedt: "A few updates and fixes: - move the suppressing of the __builtin_return_address >0 warning to the tracing directory only. - metag recordmcount fix for newer glibc's - two tracing histogram fixes that were reported by KASAN" * tag 'trace-v4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: tracing: Fix use-after-free in hist_register_trigger() tracing: Fix use-after-free in hist_unreg_all/hist_enable_unreg_all Makefile: Mute warning for __builtin_return_address(>0) for tracing only ftrace/recordmcount: Work around for addition of metag magic but not relocations
Showing the changes to scripts (1 of 4 files). Show all
Unified · Split
| @@ -33,10 +33,17 @@ · 32 unmodified lines | ||
| 33 | 33 | #include <string.h> |
| 34 | 34 | #include <unistd.h> |
| 35 | 35 | |
| 36 | +/* | |
| 37 | + * glibc synced up and added the metag number but didn't add the relocations. | |
| 38 | + * Work around this in a crude manner for now. | |
| 39 | + */ | |
| 36 | 40 | #ifndef EM_METAG |
| 37 | −/* Remove this when these make it to the standard system elf.h. */ | |
| 38 | 41 | #define EM_METAG 174 |
| 42 | +#endif | |
| 43 | +#ifndef R_METAG_ADDR32 | |
| 39 | 44 | #define R_METAG_ADDR32 2 |
| 45 | +#endif | |
| 46 | +#ifndef R_METAG_NONE | |
| 40 | 47 | #define R_METAG_NONE 3 |
| 41 | 48 | #endif |
| 42 | 49 | |