diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /include/asm-s390/setup.h | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'include/asm-s390/setup.h')
| -rw-r--r-- | include/asm-s390/setup.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-s390/setup.h b/include/asm-s390/setup.h index da3fd4a7bb32..19e31979309a 100644 --- a/include/asm-s390/setup.h +++ b/include/asm-s390/setup.h | |||
| @@ -40,15 +40,16 @@ extern unsigned long machine_flags; | |||
| 40 | #define MACHINE_IS_VM (machine_flags & 1) | 40 | #define MACHINE_IS_VM (machine_flags & 1) |
| 41 | #define MACHINE_IS_P390 (machine_flags & 4) | 41 | #define MACHINE_IS_P390 (machine_flags & 4) |
| 42 | #define MACHINE_HAS_MVPG (machine_flags & 16) | 42 | #define MACHINE_HAS_MVPG (machine_flags & 16) |
| 43 | #define MACHINE_HAS_DIAG44 (machine_flags & 32) | ||
| 44 | #define MACHINE_HAS_IDTE (machine_flags & 128) | 43 | #define MACHINE_HAS_IDTE (machine_flags & 128) |
| 45 | 44 | ||
| 46 | #ifndef __s390x__ | 45 | #ifndef __s390x__ |
| 47 | #define MACHINE_HAS_IEEE (machine_flags & 2) | 46 | #define MACHINE_HAS_IEEE (machine_flags & 2) |
| 48 | #define MACHINE_HAS_CSP (machine_flags & 8) | 47 | #define MACHINE_HAS_CSP (machine_flags & 8) |
| 48 | #define MACHINE_HAS_DIAG44 (1) | ||
| 49 | #else /* __s390x__ */ | 49 | #else /* __s390x__ */ |
| 50 | #define MACHINE_HAS_IEEE (1) | 50 | #define MACHINE_HAS_IEEE (1) |
| 51 | #define MACHINE_HAS_CSP (1) | 51 | #define MACHINE_HAS_CSP (1) |
| 52 | #define MACHINE_HAS_DIAG44 (machine_flags & 32) | ||
| 52 | #endif /* __s390x__ */ | 53 | #endif /* __s390x__ */ |
| 53 | 54 | ||
| 54 | 55 | ||