leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel

Browse Source 
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
This commit is contained in:
Linus Torvalds
2018-09-13 16:33:26 -10:00
parent 1d176582c7 5c41aaad40
commit 72d4c6e589
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/hexagon/include/asm/bitops.h
View File

@@ -211,7 +211,7 @@ static inline long ffz(int x)
* This is defined the same way as ffs. * This is defined the same way as ffs.
* Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32. * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
*/ */
static inline long fls(int x) static inline int fls(int x)
{ {
int r; int r;
@@ -232,7 +232,7 @@ static inline long fls(int x)
* the libc and compiler builtin ffs routines, therefore * the libc and compiler builtin ffs routines, therefore
* differs in spirit from the above ffz (man ffs). * differs in spirit from the above ffz (man ffs).
*/ */
static inline long ffs(int x) static inline int ffs(int x)
{ {
int r; int r;

2
arch/hexagon/kernel/dma.c
View File

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