diff options
| author |   Mark Brown <broonie@kernel.org> | 2020-12-28 14:20:15 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-12-28 14:20:15 +0000 |
| commit | 8db90aa36063f471bea1e65e23185913043852dc (patch) | |
| tree | 32f765852c4663ae28751bd2ab32463da6591701 /kernel/gcov | |
| parent | spi: stm32: FIFO threshold level - fix align packet size (diff) | |
| parent | Linux 5.11-rc1 (diff) | |
| download | wireguard-linux-8db90aa36063f471bea1e65e23185913043852dc.tar.xz wireguard-linux-8db90aa36063f471bea1e65e23185913043852dc.zip | |
Merge tag 'v5.11-rc1' into spi-5.11
Linux 5.11-rc1
Diffstat (limited to '')
| -rw-r--r-- | kernel/gcov/gcc_4_7.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/kernel/gcov/gcc_4_7.c b/kernel/gcov/gcc_4_7.c index 53c67c87f141..c53408a00d0b 100644 --- a/kernel/gcov/gcc_4_7.c +++ b/kernel/gcov/gcc_4_7.c @@ -25,10 +25,8 @@ #define GCOV_COUNTERS 9 #elif (__GNUC__ > 5) || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1) #define GCOV_COUNTERS 10 -#elif __GNUC__ == 4 && __GNUC_MINOR__ >= 9 -#define GCOV_COUNTERS 9 #else -#define GCOV_COUNTERS 8 +#define GCOV_COUNTERS 9 #endif #define GCOV_TAG_FUNCTION_LENGTH 3 @@ -229,10 +227,10 @@ int gcov_info_is_compatible(struct gcov_info *info1, struct gcov_info *info2) /** * gcov_info_add - add up profiling data - * @dest: profiling data set to which data is added - * @source: profiling data set which is added + * @dst: profiling data set to which data is added + * @src: profiling data set which is added * - * Adds profiling counts of @source to @dest. + * Adds profiling counts of @src to @dst. */ void gcov_info_add(struct gcov_info *dst, struct gcov_info *src) { |