diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-05-09 14:32:44 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-05-09 14:32:44 -0700 |
| commit | 65c98038394e65228490ef44353f5d4665690f55 (patch) | |
| tree | c7bd5afb40d455d995ec65bd9a6fb5d456e0bd45 /arch/s390/include/asm/facility.h | |
| parent | bfd17879866b36e95c58721da070d9f2ac7f8901 (diff) | |
| parent | b2f44dc29bfab77b10f3a709f14677f51ce3a4cd (diff) | |
Merge branch 'fixes-non-critical' into cleanup-devices
Diffstat (limited to 'arch/s390/include/asm/facility.h')
| -rw-r--r-- | arch/s390/include/asm/facility.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/s390/include/asm/facility.h b/arch/s390/include/asm/facility.h index 1e5b27edc0c9..2ee66a65f2d4 100644 --- a/arch/s390/include/asm/facility.h +++ b/arch/s390/include/asm/facility.h @@ -38,12 +38,11 @@ static inline void stfle(u64 *stfle_fac_list, int size) unsigned long nr; preempt_disable(); - S390_lowcore.stfl_fac_list = 0; asm volatile( " .insn s,0xb2b10000,0(0)\n" /* stfl */ "0:\n" EX_TABLE(0b, 0b) - : "=m" (S390_lowcore.stfl_fac_list)); + : "+m" (S390_lowcore.stfl_fac_list)); nr = 4; /* bytes stored by stfl */ memcpy(stfle_fac_list, &S390_lowcore.stfl_fac_list, 4); if (S390_lowcore.stfl_fac_list & 0x01000000) { |