| From c589a54fe24bfec339f7af9283d5d972f6709057 Mon Sep 17 00:00:00 2001 |
| From: Thomas Huth <thuth@redhat.com> |
| Date: Sun, 7 Apr 2019 14:55:09 +0200 |
| Subject: s390/mm: silence compiler warning when compiling without CONFIG_PGSTE |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| [ Upstream commit 81a8f2beb32a5951ecf04385301f50879abc092b ] |
| |
| If CONFIG_PGSTE is not set (e.g. when compiling without KVM), GCC complains: |
| |
| CC arch/s390/mm/pgtable.o |
| arch/s390/mm/pgtable.c:413:15: warning: ‘pmd_alloc_map’ defined but not |
| used [-Wunused-function] |
| static pmd_t *pmd_alloc_map(struct mm_struct *mm, unsigned long addr) |
| ^~~~~~~~~~~~~ |
| |
| Wrap the function with "#ifdef CONFIG_PGSTE" to silence the warning. |
| |
| Signed-off-by: Thomas Huth <thuth@redhat.com> |
| Reviewed-by: David Hildenbrand <david@redhat.com> |
| Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> |
| Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/s390/mm/pgtable.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c |
| index 8485d6dc27549..9ebd01219812c 100644 |
| --- a/arch/s390/mm/pgtable.c |
| +++ b/arch/s390/mm/pgtable.c |
| @@ -410,6 +410,7 @@ static inline pmd_t pmdp_flush_lazy(struct mm_struct *mm, |
| return old; |
| } |
| |
| +#ifdef CONFIG_PGSTE |
| static pmd_t *pmd_alloc_map(struct mm_struct *mm, unsigned long addr) |
| { |
| pgd_t *pgd; |
| @@ -427,6 +428,7 @@ static pmd_t *pmd_alloc_map(struct mm_struct *mm, unsigned long addr) |
| pmd = pmd_alloc(mm, pud, addr); |
| return pmd; |
| } |
| +#endif |
| |
| pmd_t pmdp_xchg_direct(struct mm_struct *mm, unsigned long addr, |
| pmd_t *pmdp, pmd_t new) |
| -- |
| 2.20.1 |
| |
