diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-08 14:36:14 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-08 14:36:14 (GMT) |
| commit | bb3c90f0de7b34995b5e35cf5dc97a3d428b3761 (patch) | |
| tree | d5d07b61c0ab6d8688579a255e2b97b624637336 /arch/s390/kernel/head.S | |
| parent | 3d762ca1cdf38b5fb7d1774734176d1d4d56bbb7 (diff) | |
| parent | 8838101183bba239f100b0cfe31d9ebbfc2f1bd4 (diff) | |
| download | linux-fsl-qoriq-bb3c90f0de7b34995b5e35cf5dc97a3d428b3761.tar.xz | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] compile fix for latest binutils
[S390] cio: prevent purging of CCW devices in the online state
[S390] qdio: fix init sequence
[S390] Fix parameter passing for smp_switch_to_cpu()
[S390] oprofile s390: prevent stack corruption
Diffstat (limited to 'arch/s390/kernel/head.S')
| -rw-r--r-- | arch/s390/kernel/head.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S index 7061398..fb317bf 100644 --- a/arch/s390/kernel/head.S +++ b/arch/s390/kernel/head.S @@ -460,7 +460,7 @@ startup: #ifndef CONFIG_MARCH_G5 # check capabilities against MARCH_{G5,Z900,Z990,Z9_109,Z10} xc __LC_STFL_FAC_LIST(8),__LC_STFL_FAC_LIST - stfl __LC_STFL_FAC_LIST # store facility list + .insn s,0xb2b10000,__LC_STFL_FAC_LIST # store facility list tm __LC_STFL_FAC_LIST,0x01 # stfle available ? jz 0f la %r0,0 |