diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-17 17:57:20 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-17 17:57:20 -0400 |
| commit | 393d81aa026e19b6ede6f5f11955c97ee62e5df5 (patch) | |
| tree | a1d9511e488e19d41089ff0a736f6ce52a81c6e5 /include/asm-s390/setup.h | |
| parent | 93a0886e2368eafb9df5e2021fb185195cee88b2 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into xen-64bit
Diffstat (limited to 'include/asm-s390/setup.h')
| -rw-r--r-- | include/asm-s390/setup.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-s390/setup.h b/include/asm-s390/setup.h index f09ee3f72977..4ba14e463e83 100644 --- a/include/asm-s390/setup.h +++ b/include/asm-s390/setup.h | |||
| @@ -65,6 +65,7 @@ extern unsigned long machine_flags; | |||
| 65 | 65 | ||
| 66 | #define MACHINE_FLAG_VM (1UL << 0) | 66 | #define MACHINE_FLAG_VM (1UL << 0) |
| 67 | #define MACHINE_FLAG_IEEE (1UL << 1) | 67 | #define MACHINE_FLAG_IEEE (1UL << 1) |
| 68 | #define MACHINE_FLAG_P390 (1UL << 2) | ||
| 68 | #define MACHINE_FLAG_CSP (1UL << 3) | 69 | #define MACHINE_FLAG_CSP (1UL << 3) |
| 69 | #define MACHINE_FLAG_MVPG (1UL << 4) | 70 | #define MACHINE_FLAG_MVPG (1UL << 4) |
| 70 | #define MACHINE_FLAG_DIAG44 (1UL << 5) | 71 | #define MACHINE_FLAG_DIAG44 (1UL << 5) |
| @@ -77,7 +78,6 @@ extern unsigned long machine_flags; | |||
| 77 | 78 | ||
| 78 | #define MACHINE_IS_VM (machine_flags & MACHINE_FLAG_VM) | 79 | #define MACHINE_IS_VM (machine_flags & MACHINE_FLAG_VM) |
| 79 | #define MACHINE_IS_KVM (machine_flags & MACHINE_FLAG_KVM) | 80 | #define MACHINE_IS_KVM (machine_flags & MACHINE_FLAG_KVM) |
| 80 | #define MACHINE_IS_P390 (machine_flags & MACHINE_FLAG_P390) | ||
| 81 | #define MACHINE_HAS_DIAG9C (machine_flags & MACHINE_FLAG_DIAG9C) | 81 | #define MACHINE_HAS_DIAG9C (machine_flags & MACHINE_FLAG_DIAG9C) |
| 82 | 82 | ||
| 83 | #ifndef __s390x__ | 83 | #ifndef __s390x__ |