X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=arch%2Fs390%2Finclude%2Fasm%2Fkvm_host.h;h=78e07a622b4539361e6a8359266490b8a30cd44b;hb=ec04b2604c3707a46db1d26d98f82b11d0844669;hp=75535d4d7a05593145e1b216f748bed8dbb27805;hpb=f340ca0f065ecf3e7549687e763370106dacb2c2;p=deliverable%2Flinux.git

diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h
index 75535d4d7a05..78e07a622b45 100644
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@ -40,7 +40,11 @@ struct sca_block {
 	struct sca_entry cpu[64];
 } __attribute__((packed));
 
-#define KVM_PAGES_PER_HPAGE 256
+#define KVM_NR_PAGE_SIZES 2
+#define KVM_HPAGE_SHIFT(x) (PAGE_SHIFT + ((x) - 1) * 8)
+#define KVM_HPAGE_SIZE(x) (1UL << KVM_HPAGE_SHIFT(x))
+#define KVM_HPAGE_MASK(x)	(~(KVM_HPAGE_SIZE(x) - 1))
+#define KVM_PAGES_PER_HPAGE(x)	(KVM_HPAGE_SIZE(x) / PAGE_SIZE)
 
 #define CPUSTAT_HOST       0x80000000
 #define CPUSTAT_WAIT       0x10000000