Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[jlayton/linux.git] / arch / s390 / include / asm / pgtable.h

diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h
index 66d51834f2cb24a4e74fd6e98cb3541fb45461cd..12f75313e086d4695ee768bde41beac4d3418de9 100644 (file)
--- a/arch/s390/include/asm/pgtable.h
+++ b/arch/s390/include/asm/pgtable.h
@@ -782,6 +782,7 @@ static inline void pgste_set_pte(pte_t *ptep, pte_t entry)
  * @table: pointer to the page directory
  * @asce: address space control element for gmap page table
  * @crst_list: list of all crst tables used in the guest address space
+ * @pfault_enabled: defines if pfaults are applicable for the guest
  */
 struct gmap {
        struct list_head list;
@@ -790,6 +791,7 @@ struct gmap {
        unsigned long asce;
        void *private;
        struct list_head crst_list;
+       bool pfault_enabled;
 };
 
 /**