diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-11-21 14:52:07 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-11-21 14:52:07 +1100 |
| commit | abf3208a5392a47a17711cd8b4502d5c9b07c64f (patch) | |
| tree | 26022f578ed63ab05f8e3f639309888008558441 /arch/s390/include | |
| parent | a1cfa885bb22689f348185f5944ebe8ba0348bf8 (diff) | |
| parent | 379c80d931fec0edccb6ee39d8122b53ebb5c602 (diff) | |
Merge branch 'akpm-current/current'
Diffstat (limited to 'arch/s390/include')
| -rw-r--r-- | arch/s390/include/asm/bitops.h | 4 | ||||
| -rw-r--r-- | arch/s390/include/asm/pgalloc.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/s390/include/asm/bitops.h b/arch/s390/include/asm/bitops.h index 86e5b2fdee3c..d1f8a4d94cca 100644 --- a/arch/s390/include/asm/bitops.h +++ b/arch/s390/include/asm/bitops.h @@ -397,9 +397,9 @@ static inline int fls64(unsigned long word) * This is defined the same way as ffs. * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32. */ -static inline int fls(int word) +static inline int fls(unsigned int word) { - return fls64((unsigned int)word); + return fls64(word); } #else /* CONFIG_HAVE_MARCH_Z9_109_FEATURES */ diff --git a/arch/s390/include/asm/pgalloc.h b/arch/s390/include/asm/pgalloc.h index 5ee733720a57..bccb8f4a63e2 100644 --- a/arch/s390/include/asm/pgalloc.h +++ b/arch/s390/include/asm/pgalloc.h @@ -139,8 +139,8 @@ static inline void pmd_populate(struct mm_struct *mm, /* * page table entry allocation/free routines. */ -#define pte_alloc_one_kernel(mm, vmaddr) ((pte_t *) page_table_alloc(mm)) -#define pte_alloc_one(mm, vmaddr) ((pte_t *) page_table_alloc(mm)) +#define pte_alloc_one_kernel(mm) ((pte_t *)page_table_alloc(mm)) +#define pte_alloc_one(mm) ((pte_t *)page_table_alloc(mm)) #define pte_free_kernel(mm, pte) page_table_free(mm, (unsigned long *) pte) #define pte_free(mm, pte) page_table_free(mm, (unsigned long *) pte) |