[palmer:riscv-zicbom_fix 7/7] arch/riscv/mm/dma-noncoherent.c:15:14: error: redefinition of 'riscv_cbom_block_size' with a different type: 'unsigned int' vs 'int'

[Conor.Dooley at microchip.com]

I got a minor heart attack here for a minute, before I  realised
that this was the original one on the riscv-zicbom branch not the
patch I sent last night! /phew

On 13/09/2022 11:56, kernel test robot wrote:
> tree:   https://git.kernel.org/pub/scm/linux/kernel/git/palmer/linux.git riscv-zicbom_fix
> head:   933c80bff1907722a069a0d8bdce283183e4b203
> commit: 933c80bff1907722a069a0d8bdce283183e4b203 [7/7] RISC-V: Clean up the Zicbom block size probing
> config: riscv-buildonly-randconfig-r005-20220912 (https://download.01.org/0day-ci/archive/20220913/202209131858.0qmW0TEk-lkp@intel.com/config)
> compiler: clang version 16.0.0 (https://github.com/llvm/llvm-project 1546df49f5a6d09df78f569e4137ddb365a3e827)
> reproduce (this is a W=1 build):
>          wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
>          chmod +x ~/bin/make.cross
>          # install riscv cross compiling tool for clang build
>          # apt-get install binutils-riscv-linux-gnu
>          # https://git.kernel.org/pub/scm/linux/kernel/git/palmer/linux.git/commit/?id=933c80bff1907722a069a0d8bdce283183e4b203
>          git remote add palmer https://git.kernel.org/pub/scm/linux/kernel/git/palmer/linux.git
>          git fetch --no-tags palmer riscv-zicbom_fix
>          git checkout 933c80bff1907722a069a0d8bdce283183e4b203
>          # save the config file
>          mkdir build_dir && cp config build_dir/.config
>          COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=riscv SHELL=/bin/bash arch/riscv/
> 
> If you fix the issue, kindly add following tag where applicable
> Reported-by: kernel test robot <lkp at intel.com>
> 
> All errors (new ones prefixed by >>):
> 
>>> arch/riscv/mm/dma-noncoherent.c:15:14: error: redefinition of 'riscv_cbom_block_size' with a different type: 'unsigned int' vs 'int'
>     unsigned int riscv_cbom_block_size;
>                  ^
>     arch/riscv/include/asm/cacheflush.h:46:12: note: previous declaration is here
>     extern int riscv_cbom_block_size;
>                ^
>     1 error generated.
> 
> 
> vim +15 arch/riscv/mm/dma-noncoherent.c
> 
>      14	
>    > 15	unsigned int riscv_cbom_block_size;
>      16	static bool noncoherent_supported;
>      17	
>