| Message ID | 20190307144031.52494-1-cai@lca.pw (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | bff25143da0d623a1765bf78dbc82044e46da5a4 |
| Headers | show |
| Series | [v2] powerpc: silence unused-but-set-variable warnings | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch next (9580b71b5a7863c24a9bd18bcd2ad759b86b1eff) |
| snowpatch_ozlabs/build-ppc64le | success | build succeeded & removed 0 sparse warning(s) |
| snowpatch_ozlabs/build-ppc64be | success | build succeeded & removed 0 sparse warning(s) |
| snowpatch_ozlabs/build-ppc64e | success | build succeeded & removed 0 sparse warning(s) |
| snowpatch_ozlabs/build-pmac32 | success | build succeeded & removed 0 sparse warning(s) |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 18 lines checked |
Le 07/03/2019 à 15:40, Qian Cai a écrit : > pte_unmap() compiles away on some powerpc platforms, so silence the > warnings below by making it a static inline function. > > mm/memory.c: In function 'copy_pte_range': > mm/memory.c:820:24: warning: variable 'orig_dst_pte' set but not used > [-Wunused-but-set-variable] > mm/memory.c:820:9: warning: variable 'orig_src_pte' set but not used > [-Wunused-but-set-variable] > mm/madvise.c: In function 'madvise_free_pte_range': > mm/madvise.c:318:9: warning: variable 'orig_pte' set but not used > [-Wunused-but-set-variable] > mm/swap_state.c: In function 'swap_ra_info': > mm/swap_state.c:634:15: warning: variable 'orig_pte' set but not used > [-Wunused-but-set-variable] > > Suggested-by: Christophe Leroy <christophe.leroy@c-s.fr> > Signed-off-by: Qian Cai <cai@lca.pw> Reviewed-by: Christophe Leroy <christophe.leroy@c-s.fr> > --- > > v2: make it a static inline function. > > arch/powerpc/include/asm/book3s/64/pgtable.h | 3 ++- > arch/powerpc/include/asm/nohash/64/pgtable.h | 3 ++- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h > index 868fcaf56f6b..d798e33a0c86 100644 > --- a/arch/powerpc/include/asm/book3s/64/pgtable.h > +++ b/arch/powerpc/include/asm/book3s/64/pgtable.h > @@ -1006,7 +1006,8 @@ extern struct page *pgd_page(pgd_t pgd); > (((pte_t *) pmd_page_vaddr(*(dir))) + pte_index(addr)) > > #define pte_offset_map(dir,addr) pte_offset_kernel((dir), (addr)) > -#define pte_unmap(pte) do { } while(0) > + > +static inline void pte_unmap(pte_t *pte) { } > > /* to find an entry in a kernel page-table-directory */ > /* This now only contains the vmalloc pages */ > diff --git a/arch/powerpc/include/asm/nohash/64/pgtable.h b/arch/powerpc/include/asm/nohash/64/pgtable.h > index e77ed9761632..0384a3302fb6 100644 > --- a/arch/powerpc/include/asm/nohash/64/pgtable.h > +++ b/arch/powerpc/include/asm/nohash/64/pgtable.h > @@ -205,7 +205,8 @@ static inline void pgd_set(pgd_t *pgdp, unsigned long val) > (((pte_t *) pmd_page_vaddr(*(dir))) + (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))) > > #define pte_offset_map(dir,addr) pte_offset_kernel((dir), (addr)) > -#define pte_unmap(pte) do { } while(0) > + > +static inline void pte_unmap(pte_t *pte) { } > > /* to find an entry in a kernel page-table-directory */ > /* This now only contains the vmalloc pages */ >
Ping. The patchwork status is still New after a month. On 3/7/19 9:40 AM, Qian Cai wrote: > pte_unmap() compiles away on some powerpc platforms, so silence the > warnings below by making it a static inline function. > > mm/memory.c: In function 'copy_pte_range': > mm/memory.c:820:24: warning: variable 'orig_dst_pte' set but not used > [-Wunused-but-set-variable] > mm/memory.c:820:9: warning: variable 'orig_src_pte' set but not used > [-Wunused-but-set-variable] > mm/madvise.c: In function 'madvise_free_pte_range': > mm/madvise.c:318:9: warning: variable 'orig_pte' set but not used > [-Wunused-but-set-variable] > mm/swap_state.c: In function 'swap_ra_info': > mm/swap_state.c:634:15: warning: variable 'orig_pte' set but not used > [-Wunused-but-set-variable] > > Suggested-by: Christophe Leroy <christophe.leroy@c-s.fr> > Signed-off-by: Qian Cai <cai@lca.pw> > --- > > v2: make it a static inline function. > > arch/powerpc/include/asm/book3s/64/pgtable.h | 3 ++- > arch/powerpc/include/asm/nohash/64/pgtable.h | 3 ++- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h > index 868fcaf56f6b..d798e33a0c86 100644 > --- a/arch/powerpc/include/asm/book3s/64/pgtable.h > +++ b/arch/powerpc/include/asm/book3s/64/pgtable.h > @@ -1006,7 +1006,8 @@ extern struct page *pgd_page(pgd_t pgd); > (((pte_t *) pmd_page_vaddr(*(dir))) + pte_index(addr)) > > #define pte_offset_map(dir,addr) pte_offset_kernel((dir), (addr)) > -#define pte_unmap(pte) do { } while(0) > + > +static inline void pte_unmap(pte_t *pte) { } > > /* to find an entry in a kernel page-table-directory */ > /* This now only contains the vmalloc pages */ > diff --git a/arch/powerpc/include/asm/nohash/64/pgtable.h b/arch/powerpc/include/asm/nohash/64/pgtable.h > index e77ed9761632..0384a3302fb6 100644 > --- a/arch/powerpc/include/asm/nohash/64/pgtable.h > +++ b/arch/powerpc/include/asm/nohash/64/pgtable.h > @@ -205,7 +205,8 @@ static inline void pgd_set(pgd_t *pgdp, unsigned long val) > (((pte_t *) pmd_page_vaddr(*(dir))) + (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))) > > #define pte_offset_map(dir,addr) pte_offset_kernel((dir), (addr)) > -#define pte_unmap(pte) do { } while(0) > + > +static inline void pte_unmap(pte_t *pte) { } > > /* to find an entry in a kernel page-table-directory */ > /* This now only contains the vmalloc pages */ >
diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h index 868fcaf56f6b..d798e33a0c86 100644 --- a/arch/powerpc/include/asm/book3s/64/pgtable.h +++ b/arch/powerpc/include/asm/book3s/64/pgtable.h @@ -1006,7 +1006,8 @@ extern struct page *pgd_page(pgd_t pgd); (((pte_t *) pmd_page_vaddr(*(dir))) + pte_index(addr)) #define pte_offset_map(dir,addr) pte_offset_kernel((dir), (addr)) -#define pte_unmap(pte) do { } while(0) + +static inline void pte_unmap(pte_t *pte) { } /* to find an entry in a kernel page-table-directory */ /* This now only contains the vmalloc pages */ diff --git a/arch/powerpc/include/asm/nohash/64/pgtable.h b/arch/powerpc/include/asm/nohash/64/pgtable.h index e77ed9761632..0384a3302fb6 100644 --- a/arch/powerpc/include/asm/nohash/64/pgtable.h +++ b/arch/powerpc/include/asm/nohash/64/pgtable.h @@ -205,7 +205,8 @@ static inline void pgd_set(pgd_t *pgdp, unsigned long val) (((pte_t *) pmd_page_vaddr(*(dir))) + (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))) #define pte_offset_map(dir,addr) pte_offset_kernel((dir), (addr)) -#define pte_unmap(pte) do { } while(0) + +static inline void pte_unmap(pte_t *pte) { } /* to find an entry in a kernel page-table-directory */ /* This now only contains the vmalloc pages */
pte_unmap() compiles away on some powerpc platforms, so silence the warnings below by making it a static inline function. mm/memory.c: In function 'copy_pte_range': mm/memory.c:820:24: warning: variable 'orig_dst_pte' set but not used [-Wunused-but-set-variable] mm/memory.c:820:9: warning: variable 'orig_src_pte' set but not used [-Wunused-but-set-variable] mm/madvise.c: In function 'madvise_free_pte_range': mm/madvise.c:318:9: warning: variable 'orig_pte' set but not used [-Wunused-but-set-variable] mm/swap_state.c: In function 'swap_ra_info': mm/swap_state.c:634:15: warning: variable 'orig_pte' set but not used [-Wunused-but-set-variable] Suggested-by: Christophe Leroy <christophe.leroy@c-s.fr> Signed-off-by: Qian Cai <cai@lca.pw> --- v2: make it a static inline function. arch/powerpc/include/asm/book3s/64/pgtable.h | 3 ++- arch/powerpc/include/asm/nohash/64/pgtable.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)