diff options
| author | Christian Borntraeger <borntraeger@de.ibm.com> | 2015-12-15 03:26:30 -0500 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2015-12-18 08:59:32 -0500 |
| commit | d7ae65aec0dac187d29a2963ac46574aad840a20 (patch) | |
| tree | 863936630540af831e4830c8dd3d3278dc7de820 | |
| parent | 3dbc78d3a179d99611111d2d86d4283f1f4f82b4 (diff) | |
s390/setup: cleanup machine flags
Over time some machine flags got unused (e.g. MACHINE_FLAG_MVPG)
or are available on all 64bit systems (MACHINE_FLAG_CSP,
MACHINE_FLAG_IEEE) - let's remove them.
Reorder the other ones to match the order of the MACHINE_HAS_*
macros and renumber all bits to avoid holes.
Also fix the comment about where the flags are detected.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
| -rw-r--r-- | arch/s390/include/asm/setup.h | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h index 23537661da0e..69837225119e 100644 --- a/arch/s390/include/asm/setup.h +++ b/arch/s390/include/asm/setup.h | |||
| @@ -12,27 +12,24 @@ | |||
| 12 | #define PARMAREA 0x10400 | 12 | #define PARMAREA 0x10400 |
| 13 | 13 | ||
| 14 | /* | 14 | /* |
| 15 | * Machine features detected in head.S | 15 | * Machine features detected in early.c |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #define MACHINE_FLAG_VM _BITUL(0) | 18 | #define MACHINE_FLAG_VM _BITUL(0) |
| 19 | #define MACHINE_FLAG_IEEE _BITUL(1) | 19 | #define MACHINE_FLAG_KVM _BITUL(1) |
| 20 | #define MACHINE_FLAG_CSP _BITUL(2) | 20 | #define MACHINE_FLAG_LPAR _BITUL(2) |
| 21 | #define MACHINE_FLAG_MVPG _BITUL(3) | 21 | #define MACHINE_FLAG_DIAG9C _BITUL(3) |
| 22 | #define MACHINE_FLAG_DIAG44 _BITUL(4) | 22 | #define MACHINE_FLAG_ESOP _BITUL(4) |
| 23 | #define MACHINE_FLAG_IDTE _BITUL(5) | 23 | #define MACHINE_FLAG_IDTE _BITUL(5) |
| 24 | #define MACHINE_FLAG_DIAG9C _BITUL(6) | 24 | #define MACHINE_FLAG_DIAG44 _BITUL(6) |
| 25 | #define MACHINE_FLAG_KVM _BITUL(8) | 25 | #define MACHINE_FLAG_EDAT1 _BITUL(7) |
| 26 | #define MACHINE_FLAG_ESOP _BITUL(9) | 26 | #define MACHINE_FLAG_EDAT2 _BITUL(8) |
| 27 | #define MACHINE_FLAG_EDAT1 _BITUL(10) | 27 | #define MACHINE_FLAG_LPP _BITUL(9) |
| 28 | #define MACHINE_FLAG_EDAT2 _BITUL(11) | 28 | #define MACHINE_FLAG_TOPOLOGY _BITUL(10) |
| 29 | #define MACHINE_FLAG_LPAR _BITUL(12) | 29 | #define MACHINE_FLAG_TE _BITUL(11) |
| 30 | #define MACHINE_FLAG_LPP _BITUL(13) | 30 | #define MACHINE_FLAG_TLB_LC _BITUL(12) |
| 31 | #define MACHINE_FLAG_TOPOLOGY _BITUL(14) | 31 | #define MACHINE_FLAG_VX _BITUL(13) |
| 32 | #define MACHINE_FLAG_TE _BITUL(15) | 32 | #define MACHINE_FLAG_CAD _BITUL(14) |
| 33 | #define MACHINE_FLAG_TLB_LC _BITUL(17) | ||
| 34 | #define MACHINE_FLAG_VX _BITUL(18) | ||
| 35 | #define MACHINE_FLAG_CAD _BITUL(19) | ||
| 36 | 33 | ||
| 37 | #define LPP_MAGIC _BITUL(31) | 34 | #define LPP_MAGIC _BITUL(31) |
| 38 | #define LPP_PFAULT_PID_MASK _AC(0xffffffff, UL) | 35 | #define LPP_PFAULT_PID_MASK _AC(0xffffffff, UL) |