| Message ID | 20230508102426.130768-1-nrb@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [kvm-unit-tests,v1] lib: s390x: mmu: fix conflicting types for get_dat_entry | expand |
On 08/05/2023 12.24, Nico Boehr wrote: > This causes compilation to fail with GCC 13: > > gcc -std=gnu99 -ffreestanding -I/kut/lib -I/kut/lib/s390x -Ilib -O2 -march=zEC12 -mbackchain -fno-delete-null-pointer-checks -g -MMD -MF lib/s390x/.mmu.d -fno-strict-aliasing -fno-common -Wall -Wwrite-strings -Wempty-body -Wuninitialized -Wignored-qualifiers -Wno-missing-braces -Werror -fomit-frame-pointer -fno-stack-protector -Wno-frame-address -fno-pic -no-pie -Wclobbered -Wunused-but-set-parameter -Wmissing-parameter-type -Wold-style-declaration -Woverride-init -Wmissing-prototypes -Wstrict-prototypes -I/kut/lib -I/kut/lib/s390x -Ilib -c -o lib/s390x/mmu.o lib/s390x/mmu.c > lib/s390x/mmu.c:132:7: error: conflicting types for ‘get_dat_entry’ due to enum/integer mismatch; have ‘void *(pgd_t *, void *, enum pgt_level)’ [-Werror=enum-int-mismatch] > 132 | void *get_dat_entry(pgd_t *pgtable, void *vaddr, enum pgt_level level) > | ^~~~~~~~~~~~~ > In file included from lib/s390x/mmu.c:16: > lib/s390x/mmu.h:96:7: note: previous declaration of ‘get_dat_entry’ with type ‘void *(pgd_t *, void *, unsigned int)’ > 96 | void *get_dat_entry(pgd_t *pgtable, void *vaddr, unsigned int level); > | ^~~~~~~~~~~~~ > > Signed-off-by: Nico Boehr <nrb@linux.ibm.com> > --- > lib/s390x/mmu.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/lib/s390x/mmu.h b/lib/s390x/mmu.h > index 15f88e4f424e..dadc2e600f9a 100644 > --- a/lib/s390x/mmu.h > +++ b/lib/s390x/mmu.h > @@ -93,6 +93,6 @@ static inline void unprotect_page(void *vaddr, unsigned long prot) > unprotect_dat_entry(vaddr, prot, pgtable_level_pte); > } > > -void *get_dat_entry(pgd_t *pgtable, void *vaddr, unsigned int level); > +void *get_dat_entry(pgd_t *pgtable, void *vaddr, enum pgt_level level); > > #endif /* _ASMS390X_MMU_H_ */ Reviewed-by: Thomas Huth <thuth@redhat.com>
On Mon, 2023-05-08 at 12:24 +0200, Nico Boehr wrote: > This causes compilation to fail with GCC 13: > > gcc -std=gnu99 -ffreestanding -I/kut/lib -I/kut/lib/s390x -Ilib -O2 -march=zEC12 -mbackchain -fno-delete-null-pointer-checks -g -MMD -MF lib/s390x/.mmu.d -fno-strict-aliasing -fno-common -Wall -Wwrite-strings -Wempty-body -Wuninitialized -Wignored-qualifiers -Wno-missing-braces -Werror -fomit-frame-pointer -fno-stack-protector -Wno-frame-address -fno-pic -no-pie -Wclobbered -Wunused-but-set-parameter -Wmissing-parameter-type -Wold-style-declaration -Woverride-init -Wmissing-prototypes -Wstrict-prototypes -I/kut/lib -I/kut/lib/s390x -Ilib -c -o lib/s390x/mmu.o lib/s390x/mmu.c > lib/s390x/mmu.c:132:7: error: conflicting types for ‘get_dat_entry’ due to enum/integer mismatch; have ‘void *(pgd_t *, void *, enum pgt_level)’ [-Werror=enum-int-mismatch] > 132 | void *get_dat_entry(pgd_t *pgtable, void *vaddr, enum pgt_level level) > | ^~~~~~~~~~~~~ > In file included from lib/s390x/mmu.c:16: > lib/s390x/mmu.h:96:7: note: previous declaration of ‘get_dat_entry’ with type ‘void *(pgd_t *, void *, unsigned int)’ > 96 | void *get_dat_entry(pgd_t *pgtable, void *vaddr, unsigned int level); > | ^~~~~~~~~~~~~ > > Signed-off-by: Nico Boehr <nrb@linux.ibm.com> Reviewed-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com> > --- > lib/s390x/mmu.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/lib/s390x/mmu.h b/lib/s390x/mmu.h > index 15f88e4f424e..dadc2e600f9a 100644 > --- a/lib/s390x/mmu.h > +++ b/lib/s390x/mmu.h > @@ -93,6 +93,6 @@ static inline void unprotect_page(void *vaddr, unsigned long prot) > unprotect_dat_entry(vaddr, prot, pgtable_level_pte); > } > > -void *get_dat_entry(pgd_t *pgtable, void *vaddr, unsigned int level); > +void *get_dat_entry(pgd_t *pgtable, void *vaddr, enum pgt_level level); > > #endif /* _ASMS390X_MMU_H_ */
On Mon, 8 May 2023 12:24:26 +0200 Nico Boehr <nrb@linux.ibm.com> wrote: > This causes compilation to fail with GCC 13: > > gcc -std=gnu99 -ffreestanding -I/kut/lib -I/kut/lib/s390x -Ilib -O2 -march=zEC12 -mbackchain -fno-delete-null-pointer-checks -g -MMD -MF lib/s390x/.mmu.d -fno-strict-aliasing -fno-common -Wall -Wwrite-strings -Wempty-body -Wuninitialized -Wignored-qualifiers -Wno-missing-braces -Werror -fomit-frame-pointer -fno-stack-protector -Wno-frame-address -fno-pic -no-pie -Wclobbered -Wunused-but-set-parameter -Wmissing-parameter-type -Wold-style-declaration -Woverride-init -Wmissing-prototypes -Wstrict-prototypes -I/kut/lib -I/kut/lib/s390x -Ilib -c -o lib/s390x/mmu.o lib/s390x/mmu.c > lib/s390x/mmu.c:132:7: error: conflicting types for ‘get_dat_entry’ due to enum/integer mismatch; have ‘void *(pgd_t *, void *, enum pgt_level)’ [-Werror=enum-int-mismatch] > 132 | void *get_dat_entry(pgd_t *pgtable, void *vaddr, enum pgt_level level) > | ^~~~~~~~~~~~~ > In file included from lib/s390x/mmu.c:16: > lib/s390x/mmu.h:96:7: note: previous declaration of ‘get_dat_entry’ with type ‘void *(pgd_t *, void *, unsigned int)’ > 96 | void *get_dat_entry(pgd_t *pgtable, void *vaddr, unsigned int level); > | ^~~~~~~~~~~~~ > > Signed-off-by: Nico Boehr <nrb@linux.ibm.com> Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com> > --- > lib/s390x/mmu.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/lib/s390x/mmu.h b/lib/s390x/mmu.h > index 15f88e4f424e..dadc2e600f9a 100644 > --- a/lib/s390x/mmu.h > +++ b/lib/s390x/mmu.h > @@ -93,6 +93,6 @@ static inline void unprotect_page(void *vaddr, unsigned long prot) > unprotect_dat_entry(vaddr, prot, pgtable_level_pte); > } > > -void *get_dat_entry(pgd_t *pgtable, void *vaddr, unsigned int level); > +void *get_dat_entry(pgd_t *pgtable, void *vaddr, enum pgt_level level); > > #endif /* _ASMS390X_MMU_H_ */
diff --git a/lib/s390x/mmu.h b/lib/s390x/mmu.h index 15f88e4f424e..dadc2e600f9a 100644 --- a/lib/s390x/mmu.h +++ b/lib/s390x/mmu.h @@ -93,6 +93,6 @@ static inline void unprotect_page(void *vaddr, unsigned long prot) unprotect_dat_entry(vaddr, prot, pgtable_level_pte); } -void *get_dat_entry(pgd_t *pgtable, void *vaddr, unsigned int level); +void *get_dat_entry(pgd_t *pgtable, void *vaddr, enum pgt_level level); #endif /* _ASMS390X_MMU_H_ */
This causes compilation to fail with GCC 13: gcc -std=gnu99 -ffreestanding -I/kut/lib -I/kut/lib/s390x -Ilib -O2 -march=zEC12 -mbackchain -fno-delete-null-pointer-checks -g -MMD -MF lib/s390x/.mmu.d -fno-strict-aliasing -fno-common -Wall -Wwrite-strings -Wempty-body -Wuninitialized -Wignored-qualifiers -Wno-missing-braces -Werror -fomit-frame-pointer -fno-stack-protector -Wno-frame-address -fno-pic -no-pie -Wclobbered -Wunused-but-set-parameter -Wmissing-parameter-type -Wold-style-declaration -Woverride-init -Wmissing-prototypes -Wstrict-prototypes -I/kut/lib -I/kut/lib/s390x -Ilib -c -o lib/s390x/mmu.o lib/s390x/mmu.c lib/s390x/mmu.c:132:7: error: conflicting types for ‘get_dat_entry’ due to enum/integer mismatch; have ‘void *(pgd_t *, void *, enum pgt_level)’ [-Werror=enum-int-mismatch] 132 | void *get_dat_entry(pgd_t *pgtable, void *vaddr, enum pgt_level level) | ^~~~~~~~~~~~~ In file included from lib/s390x/mmu.c:16: lib/s390x/mmu.h:96:7: note: previous declaration of ‘get_dat_entry’ with type ‘void *(pgd_t *, void *, unsigned int)’ 96 | void *get_dat_entry(pgd_t *pgtable, void *vaddr, unsigned int level); | ^~~~~~~~~~~~~ Signed-off-by: Nico Boehr <nrb@linux.ibm.com> --- lib/s390x/mmu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)