diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-17 09:05:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-17 09:05:38 -0700 |
| commit | ee723cb3d419afcc8b6c7ccc0f73a34b0eb5ac7b (patch) | |
| tree | 630bc3f1d0e57687e777d2f30e478a23baca9353 /include/asm-s390/setup.h | |
| parent | 7023cc61292f9cd61d99521206480f6e387132ff (diff) | |
| parent | 8586cb60ce85f40431cf06fe97512269d3992f03 (diff) | |
| download | op-kernel-dev-ee723cb3d419afcc8b6c7ccc0f73a34b0eb5ac7b.zip op-kernel-dev-ee723cb3d419afcc8b6c7ccc0f73a34b0eb5ac7b.tar.gz | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] dasd: use -EOPNOTSUPP instead of -ENOTSUPP
[S390] qdio: new qdio driver.
[S390] cio: Export chsc_error_from_response().
[S390] vmur: Fix return code handling.
[S390] Fix stacktrace compile bug.
[S390] Increase default warning stacksize.
[S390] dasd: Fix cleanup in dasd_{fba,diag}_check_characteristics().
[S390] chsc headers userspace cleanup
[S390] dasd: fix unsolicited SIM handling.
[S390] zfcpdump: Make SCSI disk dump tool recognize storage holes
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 f09ee3f..4ba14e4 100644 --- a/include/asm-s390/setup.h +++ b/include/asm-s390/setup.h @@ -65,6 +65,7 @@ extern unsigned long machine_flags; #define MACHINE_FLAG_VM (1UL << 0) #define MACHINE_FLAG_IEEE (1UL << 1) +#define MACHINE_FLAG_P390 (1UL << 2) #define MACHINE_FLAG_CSP (1UL << 3) #define MACHINE_FLAG_MVPG (1UL << 4) #define MACHINE_FLAG_DIAG44 (1UL << 5) @@ -77,7 +78,6 @@ extern unsigned long machine_flags; #define MACHINE_IS_VM (machine_flags & MACHINE_FLAG_VM) #define MACHINE_IS_KVM (machine_flags & MACHINE_FLAG_KVM) -#define MACHINE_IS_P390 (machine_flags & MACHINE_FLAG_P390) #define MACHINE_HAS_DIAG9C (machine_flags & MACHINE_FLAG_DIAG9C) #ifndef __s390x__ |
