Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel (72d4c6e5) · Commits · 戴 / test

Pull hexagon fixes from Richard Kuo: "Some fixes for compile warnings" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel: hexagon: modify ffs() and fls() to return int arch/hexagon: fix kernel/dma.c build warning

arch/hexagon/include/asm/bitops.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -211,7 +211,7 @@ static inline long ffz(int x)
		* This is defined the same way as ffs.
		* Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
		*/
		static inline long fls(int x)
		static inline int fls(int x)
		{
		int r;

		@@ -232,7 +232,7 @@ static inline long fls(int x)
		* the libc and compiler builtin ffs routines, therefore
		* differs in spirit from the above ffz (man ffs).
		*/
		static inline long ffs(int x)
		static inline int ffs(int x)
		{
		int r;

+1 −1

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ static void hexagon_dma_alloc_coherent(struct device dev, size_t size,
		panic("Can't create %s() memory pool!", __func__);
		else
		gen_pool_add(coherent_pool,
		pfn_to_virt(max_low_pfn),
		(unsigned long)pfn_to_virt(max_low_pfn),
		hexagon_coherent_pool_size, -1);
		}