Commit 6c61cfe9 authored by Martin Schwidefsky's avatar Martin Schwidefsky
Browse files

[S390] fix kvm defines for 31 bit compile 



KVM is not available for 31 bit but the KVM defines cause warnings:

arch/s390/include/asm/pgtable.h: In function 'ptep_test_and_clear_user_dirty':
arch/s390/include/asm/pgtable.h:817: warning: integer constant is too large for 'unsigned long' type
arch/s390/include/asm/pgtable.h:818: warning: integer constant is too large for 'unsigned long' type
arch/s390/include/asm/pgtable.h: In function 'ptep_test_and_clear_user_young':
arch/s390/include/asm/pgtable.h:837: warning: integer constant is too large for 'unsigned long' type
arch/s390/include/asm/pgtable.h:838: warning: integer constant is too large for 'unsigned long' type

Add 31 bit versions of the KVM defines to remove the warnings.

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 36409f63

arch/s390/include/asm/pgtable.h

+26 −13
Original line number Diff line number Diff line
@@ -293,19 +293,6 @@ extern unsigned long VMALLOC_START; 
 * swap pte is 1011 and 0001, 0011, 0101, 0111 are invalid.

 */



/* Page status table bits for virtualization */

#define RCP_ACC_BITS	0xf000000000000000UL

#define RCP_FP_BIT	0x0800000000000000UL

#define RCP_PCL_BIT	0x0080000000000000UL

#define RCP_HR_BIT	0x0040000000000000UL

#define RCP_HC_BIT	0x0020000000000000UL

#define RCP_GR_BIT	0x0004000000000000UL

#define RCP_GC_BIT	0x0002000000000000UL



/* User dirty / referenced bit for KVM's migration feature */

#define KVM_UR_BIT	0x0000800000000000UL

#define KVM_UC_BIT	0x0000400000000000UL



#ifndef __s390x__



/* Bits in the segment table address-space-control-element */
@@ -325,6 +312,19 @@ extern unsigned long VMALLOC_START; 
#define _SEGMENT_ENTRY		(_SEGMENT_ENTRY_PTL)

#define _SEGMENT_ENTRY_EMPTY	(_SEGMENT_ENTRY_INV)



/* Page status table bits for virtualization */

#define RCP_ACC_BITS	0xf0000000UL

#define RCP_FP_BIT	0x08000000UL

#define RCP_PCL_BIT	0x00800000UL

#define RCP_HR_BIT	0x00400000UL

#define RCP_HC_BIT	0x00200000UL

#define RCP_GR_BIT	0x00040000UL

#define RCP_GC_BIT	0x00020000UL



/* User dirty / referenced bit for KVM's migration feature */

#define KVM_UR_BIT	0x00008000UL

#define KVM_UC_BIT	0x00004000UL



#else /* __s390x__ */



/* Bits in the segment/region table address-space-control-element */
@@ -367,6 +367,19 @@ extern unsigned long VMALLOC_START; 
#define _SEGMENT_ENTRY_LARGE	0x400	/* STE-format control, large page   */

#define _SEGMENT_ENTRY_CO	0x100	/* change-recording override   */



/* Page status table bits for virtualization */

#define RCP_ACC_BITS	0xf000000000000000UL

#define RCP_FP_BIT	0x0800000000000000UL

#define RCP_PCL_BIT	0x0080000000000000UL

#define RCP_HR_BIT	0x0040000000000000UL

#define RCP_HC_BIT	0x0020000000000000UL

#define RCP_GR_BIT	0x0004000000000000UL

#define RCP_GC_BIT	0x0002000000000000UL



/* User dirty / referenced bit for KVM's migration feature */

#define KVM_UR_BIT	0x0000800000000000UL

#define KVM_UC_BIT	0x0000400000000000UL



#endif /* __s390x__ */



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE