Skip to content

Commit cec3858

Browse files
author
Claudio Imbrenda
committed
KVM: s390: Remove gmap from s390/mm
Remove the now unused include/asm/gmap.h and mm/gmap.c files. Acked-by: Heiko Carstens <hca@linux.ibm.com> Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
1 parent e38c884 commit cec3858

6 files changed

Lines changed: 0 additions & 2629 deletions

File tree

MAINTAINERS

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13899,14 +13899,12 @@ L: kvm@vger.kernel.org
1389913899
S: Supported
1390013900
T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
1390113901
F: Documentation/virt/kvm/s390*
13902-
F: arch/s390/include/asm/gmap.h
1390313902
F: arch/s390/include/asm/gmap_helpers.h
1390413903
F: arch/s390/include/asm/kvm*
1390513904
F: arch/s390/include/uapi/asm/kvm*
1390613905
F: arch/s390/include/uapi/asm/uvdevice.h
1390713906
F: arch/s390/kernel/uv.c
1390813907
F: arch/s390/kvm/
13909-
F: arch/s390/mm/gmap.c
1391013908
F: arch/s390/mm/gmap_helpers.c
1391113909
F: drivers/s390/char/uvdevice.c
1391213910
F: tools/testing/selftests/drivers/s390x/uvdevice/

arch/s390/include/asm/gmap.h

Lines changed: 0 additions & 174 deletions
This file was deleted.

arch/s390/include/asm/pgtable.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1369,8 +1369,6 @@ static inline int ptep_set_access_flags(struct vm_area_struct *vma,
13691369
void ptep_set_pte_at(struct mm_struct *mm, unsigned long addr,
13701370
pte_t *ptep, pte_t entry);
13711371
void ptep_set_notify(struct mm_struct *mm, unsigned long addr, pte_t *ptep);
1372-
void ptep_notify(struct mm_struct *mm, unsigned long addr,
1373-
pte_t *ptep, unsigned long bits);
13741372
int ptep_force_prot(struct mm_struct *mm, unsigned long gaddr,
13751373
pte_t *ptep, int prot, unsigned long bit);
13761374
void ptep_zap_unused(struct mm_struct *mm, unsigned long addr,
@@ -1396,9 +1394,6 @@ int set_pgste_bits(struct mm_struct *mm, unsigned long addr,
13961394
int get_pgste(struct mm_struct *mm, unsigned long hva, unsigned long *pgstep);
13971395
int pgste_perform_essa(struct mm_struct *mm, unsigned long hva, int orc,
13981396
unsigned long *oldpte, unsigned long *oldpgste);
1399-
void gmap_pmdp_invalidate(struct mm_struct *mm, unsigned long vmaddr);
1400-
void gmap_pmdp_idte_local(struct mm_struct *mm, unsigned long vmaddr);
1401-
void gmap_pmdp_idte_global(struct mm_struct *mm, unsigned long vmaddr);
14021397

14031398
#define pgprot_writecombine pgprot_writecombine
14041399
pgprot_t pgprot_writecombine(pgprot_t prot);
@@ -2023,9 +2018,6 @@ extern int __vmem_map_4k_page(unsigned long addr, unsigned long phys, pgprot_t p
20232018
extern int vmem_map_4k_page(unsigned long addr, unsigned long phys, pgprot_t prot);
20242019
extern void vmem_unmap_4k_page(unsigned long addr);
20252020
extern pte_t *vmem_get_alloc_pte(unsigned long addr, bool alloc);
2026-
extern int s390_enable_sie(void);
2027-
extern int s390_enable_skey(void);
2028-
extern void s390_reset_cmma(struct mm_struct *mm);
20292021

20302022
/* s390 has a private copy of get unmapped area to deal with cache synonyms */
20312023
#define HAVE_ARCH_UNMAPPED_AREA

arch/s390/mm/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ obj-$(CONFIG_CMM) += cmm.o
1010
obj-$(CONFIG_DEBUG_VIRTUAL) += physaddr.o
1111
obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
1212
obj-$(CONFIG_PTDUMP) += dump_pagetables.o
13-
obj-$(CONFIG_PGSTE) += gmap.o
1413
obj-$(CONFIG_PFAULT) += pfault.o
1514

1615
obj-$(subst m,y,$(CONFIG_KVM)) += gmap_helpers.o

0 commit comments

Comments
 (0)