Commit cc50f105 authored by Claudio Imbrenda's avatar Claudio Imbrenda
Browse files

KVM: s390: Stop using CONFIG_PGSTE 



Switch to using IS_ENABLED(CONFIG_KVM) instead of CONFIG_PGSTE, since
the latter will be removed soon.

Many CONFIG_PGSTE are left behind, because they will be removed
completely in upcoming patches. The ones replaced here are mostly the
ones that will stay.

Reviewed-by: default avatarSteffen Eiden <seiden@linux.ibm.com>
Acked-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarClaudio Imbrenda <imbrenda@linux.ibm.com>
parent e5f98a68

arch/s390/include/asm/mmu_context.h

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static inline int init_new_context(struct task_struct *tsk, 
	atomic_set(&mm->context.protected_count, 0);

	mm->context.gmap_asce = 0;

	mm->context.flush_mm = 0;

#ifdef CONFIG_PGSTE

#if IS_ENABLED(CONFIG_KVM)

	mm->context.has_pgste = 0;

	mm->context.uses_skeys = 0;

	mm->context.uses_cmm = 0;

arch/s390/include/asm/pgtable.h

+2 −2
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ static inline int mm_has_pgste(struct mm_struct *mm) 


static inline int mm_is_protected(struct mm_struct *mm)

{

#ifdef CONFIG_PGSTE

#if IS_ENABLED(CONFIG_KVM)

	if (unlikely(atomic_read(&mm->context.protected_count)))

		return 1;

#endif
@@ -632,7 +632,7 @@ static inline pud_t set_pud_bit(pud_t pud, pgprot_t prot) 
#define mm_forbids_zeropage mm_forbids_zeropage

static inline int mm_forbids_zeropage(struct mm_struct *mm)

{

#ifdef CONFIG_PGSTE

#if IS_ENABLED(CONFIG_KVM)

	if (!mm->context.allow_cow_sharing)

		return 1;

#endif

arch/s390/mm/fault.c

+2 −2
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ void do_dat_exception(struct pt_regs *regs) 
}

NOKPROBE_SYMBOL(do_dat_exception);



#if IS_ENABLED(CONFIG_PGSTE)

#if IS_ENABLED(CONFIG_KVM)



void do_secure_storage_access(struct pt_regs *regs)

{
@@ -470,4 +470,4 @@ void do_secure_storage_access(struct pt_regs *regs) 
}

NOKPROBE_SYMBOL(do_secure_storage_access);



#endif /* CONFIG_PGSTE */
 
#endif /* CONFIG_KVM */