diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-30 18:30:30 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-30 18:30:30 +0300 |
| commit | d60d61f36b8f8d3f67c3fe49ee35cfd54b3bc49b (patch) | |
| tree | 5349889eb3b44c6fe758f29c93ac3dc573634723 /arch/s390 | |
| parent | 0044cdeb731313f20b63cb5644de7588731de32b (diff) | |
| parent | f0f59a2fab8e52b9d582b39da39f22230ca80aee (diff) | |
| download | linux-d60d61f36b8f8d3f67c3fe49ee35cfd54b3bc49b.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
- a missing -msoft-float for the compile of the kexec purgatory
- a fix for the dasd driver to avoid the double use of a field in the
'struct request'
[ That latter one is being discussed, and Christoph asked for something
cleaner, but for now it's a fix ]
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/dasd: use blk_mq_rq_from_pdu for per request data
s390/purgatory: Fix endless interrupt loop
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/purgatory/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/purgatory/Makefile b/arch/s390/purgatory/Makefile index e9525bc1b4a6..1ace023cbdce 100644 --- a/arch/s390/purgatory/Makefile +++ b/arch/s390/purgatory/Makefile @@ -21,7 +21,7 @@ LDFLAGS_purgatory.ro += -z nodefaultlib KBUILD_CFLAGS := -fno-strict-aliasing -Wall -Wstrict-prototypes KBUILD_CFLAGS += -Wno-pointer-sign -Wno-sign-compare KBUILD_CFLAGS += -fno-zero-initialized-in-bss -fno-builtin -ffreestanding -KBUILD_CFLAGS += -c -MD -Os -m64 +KBUILD_CFLAGS += -c -MD -Os -m64 -msoft-float KBUILD_CFLAGS += $(call cc-option,-fno-PIE) $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE |