Skip to content

Commit 51ce022

Browse files
Qian CaiVasily Gorbik
authored andcommitted
s390/mm: fix -Wunused-but-set-variable warnings
Convert two functions to static inline to get ride of W=1 GCC warnings like, mm/gup.c: In function 'gup_pte_range': mm/gup.c:1816:16: warning: variable 'ptem' set but not used [-Wunused-but-set-variable] pte_t *ptep, *ptem; ^~~~ mm/mmap.c: In function 'acct_stack_growth': mm/mmap.c:2322:16: warning: variable 'new_start' set but not used [-Wunused-but-set-variable] unsigned long new_start; ^~~~~~~~~ Signed-off-by: Qian Cai <[email protected]> Link: https://lore.kernel.org/lkml/[email protected]/ Signed-off-by: Christian Borntraeger <[email protected]> Signed-off-by: Vasily Gorbik <[email protected]>
1 parent 5c8e10f commit 51ce022

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

arch/s390/include/asm/hugetlb.h

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
#include <asm/page.h>
1313
#include <asm/pgtable.h>
1414

15-
16-
#define is_hugepage_only_range(mm, addr, len) 0
1715
#define hugetlb_free_pgd_range free_pgd_range
1816
#define hugepages_supported() (MACHINE_HAS_EDAT1)
1917

@@ -23,6 +21,13 @@ pte_t huge_ptep_get(pte_t *ptep);
2321
pte_t huge_ptep_get_and_clear(struct mm_struct *mm,
2422
unsigned long addr, pte_t *ptep);
2523

24+
static inline bool is_hugepage_only_range(struct mm_struct *mm,
25+
unsigned long addr,
26+
unsigned long len)
27+
{
28+
return false;
29+
}
30+
2631
/*
2732
* If the arch doesn't supply something else, assume that hugepage
2833
* size aligned regions are ok without further preparation.

arch/s390/include/asm/pgtable.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1269,7 +1269,8 @@ static inline pte_t *pte_offset(pmd_t *pmd, unsigned long address)
12691269

12701270
#define pte_offset_kernel(pmd, address) pte_offset(pmd, address)
12711271
#define pte_offset_map(pmd, address) pte_offset_kernel(pmd, address)
1272-
#define pte_unmap(pte) do { } while (0)
1272+
1273+
static inline void pte_unmap(pte_t *pte) { }
12731274

12741275
static inline bool gup_fast_permitted(unsigned long start, unsigned long end)
12751276
{

0 commit comments

Comments
 (0)