diff options
author | 2021-01-15 12:48:43 +0200 | |
---|---|---|
committer | 2021-01-15 12:48:43 +0200 | |
commit | 715a1284d89a740b197b3bad5eb20d36a397382f (patch) | |
tree | 07ad2960ab66e56b3d1e151036262019a18e3df1 /kernel/gcov | |
parent | ARM: dts; gta04: SPI panel chip select is active low (diff) | |
parent | ARM: OMAP2+: Fix suspcious RCU usage splats for omap_enter_idle_coupled (diff) | |
download | wireguard-linux-715a1284d89a740b197b3bad5eb20d36a397382f.tar.xz wireguard-linux-715a1284d89a740b197b3bad5eb20d36a397382f.zip |
Merge branch 'cpuidle-fix' into fixes
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) { |