Skip to content

Commit cc50f10

Browse files
author
Claudio Imbrenda
committed
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: Steffen Eiden <seiden@linux.ibm.com> Acked-by: Heiko Carstens <hca@linux.ibm.com> Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
1 parent e5f98a6 commit cc50f10

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

arch/s390/include/asm/mmu_context.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ static inline int init_new_context(struct task_struct *tsk,
2929
atomic_set(&mm->context.protected_count, 0);
3030
mm->context.gmap_asce = 0;
3131
mm->context.flush_mm = 0;
32-
#ifdef CONFIG_PGSTE
32+
#if IS_ENABLED(CONFIG_KVM)
3333
mm->context.has_pgste = 0;
3434
mm->context.uses_skeys = 0;
3535
mm->context.uses_cmm = 0;

arch/s390/include/asm/pgtable.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ static inline int mm_has_pgste(struct mm_struct *mm)
577577

578578
static inline int mm_is_protected(struct mm_struct *mm)
579579
{
580-
#ifdef CONFIG_PGSTE
580+
#if IS_ENABLED(CONFIG_KVM)
581581
if (unlikely(atomic_read(&mm->context.protected_count)))
582582
return 1;
583583
#endif
@@ -632,7 +632,7 @@ static inline pud_t set_pud_bit(pud_t pud, pgprot_t prot)
632632
#define mm_forbids_zeropage mm_forbids_zeropage
633633
static inline int mm_forbids_zeropage(struct mm_struct *mm)
634634
{
635-
#ifdef CONFIG_PGSTE
635+
#if IS_ENABLED(CONFIG_KVM)
636636
if (!mm->context.allow_cow_sharing)
637637
return 1;
638638
#endif

arch/s390/mm/fault.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ void do_dat_exception(struct pt_regs *regs)
403403
}
404404
NOKPROBE_SYMBOL(do_dat_exception);
405405

406-
#if IS_ENABLED(CONFIG_PGSTE)
406+
#if IS_ENABLED(CONFIG_KVM)
407407

408408
void do_secure_storage_access(struct pt_regs *regs)
409409
{
@@ -470,4 +470,4 @@ void do_secure_storage_access(struct pt_regs *regs)
470470
}
471471
NOKPROBE_SYMBOL(do_secure_storage_access);
472472

473-
#endif /* CONFIG_PGSTE */
473+
#endif /* CONFIG_KVM */

0 commit comments

Comments
 (0)