| From 346e1dfc6e7475c63226fde9bbd55f6c288ecb63 Mon Sep 17 00:00:00 2001 |
| From: Nathan Chancellor <natechancellor@gmail.com> |
| Date: Sat, 8 Feb 2020 07:08:59 -0700 |
| Subject: [PATCH] s390/time: Fix clk type in get_tod_clock |
| |
| commit 0f8a206df7c920150d2aa45574fba0ab7ff6be4f upstream. |
| |
| Clang warns: |
| |
| In file included from ../arch/s390/boot/startup.c:3: |
| In file included from ../include/linux/elf.h:5: |
| In file included from ../arch/s390/include/asm/elf.h:132: |
| In file included from ../include/linux/compat.h:10: |
| In file included from ../include/linux/time.h:74: |
| In file included from ../include/linux/time32.h:13: |
| In file included from ../include/linux/timex.h:65: |
| ../arch/s390/include/asm/timex.h:160:20: warning: passing 'unsigned char |
| [16]' to parameter of type 'char *' converts between pointers to integer |
| types with different sign [-Wpointer-sign] |
| get_tod_clock_ext(clk); |
| ^~~ |
| ../arch/s390/include/asm/timex.h:149:44: note: passing argument to |
| parameter 'clk' here |
| static inline void get_tod_clock_ext(char *clk) |
| ^ |
| |
| Change clk's type to just be char so that it matches what happens in |
| get_tod_clock_ext. |
| |
| Fixes: 57b28f66316d ("[S390] s390_hypfs: Add new attributes") |
| Link: https://github.com/ClangBuiltLinux/linux/issues/861 |
| Link: http://lkml.kernel.org/r/20200208140858.47970-1-natechancellor@gmail.com |
| Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> |
| Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> |
| Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/s390/include/asm/timex.h b/arch/s390/include/asm/timex.h |
| index 2dc9eb4e1acc..b6a4ce9dafaf 100644 |
| --- a/arch/s390/include/asm/timex.h |
| +++ b/arch/s390/include/asm/timex.h |
| @@ -155,7 +155,7 @@ static inline void get_tod_clock_ext(char *clk) |
| |
| static inline unsigned long long get_tod_clock(void) |
| { |
| - unsigned char clk[STORE_CLOCK_EXT_SIZE]; |
| + char clk[STORE_CLOCK_EXT_SIZE]; |
| |
| get_tod_clock_ext(clk); |
| return *((unsigned long long *)&clk[1]); |
| -- |
| 2.7.4 |
| |