diff options
| -rw-r--r-- | queue-5.4/rtc-test-fix-invalid-format-specifier.patch | 36 | ||||
| -rw-r--r-- | queue-5.4/series | 1 |
2 files changed, 37 insertions, 0 deletions
diff --git a/queue-5.4/rtc-test-fix-invalid-format-specifier.patch b/queue-5.4/rtc-test-fix-invalid-format-specifier.patch new file mode 100644 index 0000000000..873060a688 --- /dev/null +++ b/queue-5.4/rtc-test-fix-invalid-format-specifier.patch @@ -0,0 +1,36 @@ +From 8a904a3caa88118744062e872ae90f37748a8fd8 Mon Sep 17 00:00:00 2001 +From: David Gow <davidgow@google.com> +Date: Wed, 21 Feb 2024 17:27:18 +0800 +Subject: rtc: test: Fix invalid format specifier. + +From: David Gow <davidgow@google.com> + +commit 8a904a3caa88118744062e872ae90f37748a8fd8 upstream. + +'days' is a s64 (from div_s64), and so should use a %lld specifier. + +This was found by extending KUnit's assertion macros to use gcc's +__printf attribute. + +Fixes: 1d1bb12a8b18 ("rtc: Improve performance of rtc_time64_to_tm(). Add tests.") +Signed-off-by: David Gow <davidgow@google.com> +Tested-by: Guenter Roeck <linux@roeck-us.net> +Reviewed-by: Justin Stitt <justinstitt@google.com> +Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com> +Signed-off-by: Shuah Khan <skhan@linuxfoundation.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/rtc/lib_test.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/rtc/lib_test.c ++++ b/drivers/rtc/lib_test.c +@@ -54,7 +54,7 @@ static void rtc_time64_to_tm_test_date_r + + days = div_s64(secs, 86400); + +- #define FAIL_MSG "%d/%02d/%02d (%2d) : %ld", \ ++ #define FAIL_MSG "%d/%02d/%02d (%2d) : %lld", \ + year, month, mday, yday, days + + KUNIT_ASSERT_EQ_MSG(test, year - 1900, result.tm_year, FAIL_MSG); diff --git a/queue-5.4/series b/queue-5.4/series index 68b6cb11fc..786fdb63ab 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -218,3 +218,4 @@ rtc-improve-performance-of-rtc_time64_to_tm-.-add-tests.patch rtc-make-rtc_time64_to_tm-support-dates-before-1970.patch mm-huge_memory-fix-dereferencing-invalid-pmd-migration-entry.patch jbd2-fix-data-race-and-null-ptr-deref-in-jbd2_journal_dirty_metadata.patch +rtc-test-fix-invalid-format-specifier.patch |