diff options
| author | Roland Dreier <roland@eddore.topspincom.com> | 2005-07-27 22:12:56 -0400 |
|---|---|---|
| committer | Roland Dreier <roland@eddore.topspincom.com> | 2005-07-27 22:12:56 -0400 |
| commit | 2868bd281fef21d1e73d6b7648a41efc3d75f10c (patch) | |
| tree | 0ad821cfcc9e3f9e8b662d026bec6bb6d4ce69ac /arch/s390/kernel/setup.c | |
| parent | 6d376756f2cf3478d5a4fdb8d18e958948366b9d (diff) | |
| parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) | |
Merge /scratch/Ksrc/linux-git/
Diffstat (limited to 'arch/s390/kernel/setup.c')
| -rw-r--r-- | arch/s390/kernel/setup.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index a12183989a79..5ba5a5485da9 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c | |||
| @@ -431,12 +431,6 @@ setup_lowcore(void) | |||
| 431 | ctl_set_bit(14, 29); | 431 | ctl_set_bit(14, 29); |
| 432 | } | 432 | } |
| 433 | #endif | 433 | #endif |
| 434 | #ifdef CONFIG_ARCH_S390X | ||
| 435 | if (MACHINE_HAS_DIAG44) | ||
| 436 | lc->diag44_opcode = 0x83000044; | ||
| 437 | else | ||
| 438 | lc->diag44_opcode = 0x07000700; | ||
| 439 | #endif /* CONFIG_ARCH_S390X */ | ||
| 440 | set_prefix((u32)(unsigned long) lc); | 434 | set_prefix((u32)(unsigned long) lc); |
| 441 | } | 435 | } |
| 442 | 436 | ||