diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-09-10 14:53:27 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-09-10 15:04:19 +0200 |
| commit | d5bbf34613a877dbe3da847fa0432da8c6721e73 (patch) | |
| tree | 902a90fd7eda61aad7abae9c35b0da2e7a786995 /kernel/gcov/gcov.h | |
| parent | c6c1f7a2c194f1a2291a15c6691c0d6785f8976e (diff) | |
| parent | 336961dd3cf9c39456dd9657e8f205718740c797 (diff) | |
Merge branch 'l4t/l4t-r16' into colibri
Merge with latest NVIDIA L4T R16.
Only real conflict concerning inverted VBUS gpio support.
Diffstat (limited to 'kernel/gcov/gcov.h')
| -rw-r--r-- | kernel/gcov/gcov.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/kernel/gcov/gcov.h b/kernel/gcov/gcov.h index 040c6980df0d..8c5130a5c1b5 100644 --- a/kernel/gcov/gcov.h +++ b/kernel/gcov/gcov.h @@ -17,7 +17,14 @@ #include <linux/types.h> /* - * Profiling data types used for gcc 3.4 and above - these are defined by + * GCC 4.6 drops the 'name' field from 'struct gcov_fn_info'. + */ +#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6) +#define GCOV_FN_INFO_HAS_NAME_FIELD +#endif + +/* + * Profiling data types used for at least gcc 4.4 and 4.6 - these are defined by * gcc and need to be kept as close to the original definition as possible to * remain compatible. */ @@ -77,7 +84,9 @@ struct gcov_fn_info { unsigned int lineno_checksum; unsigned int cfg_checksum; unsigned int dc_offset; +#ifdef GCOV_FN_INFO_HAS_NAME_FIELD const char *name; +#endif unsigned int n_ctrs[0]; }; |