diff options
author | Dan Williams <dan.j.williams@intel.com> | 2015-11-09 21:29:39 +0300 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2015-11-09 21:29:39 +0300 |
commit | 85ce230051c37dfb979385eb0244bf3655625ba6 (patch) | |
tree | 90abeab25f8c1ea4836b38279790b90f0c780ae3 /arch/s390/boot/compressed/Makefile | |
parent | 538ea4aa44737127ce2b5c8511c7349d2abdcf9c (diff) | |
parent | 209851649dc4f7900a6bfe1de5e2640ab2c7d931 (diff) | |
download | linux-85ce230051c37dfb979385eb0244bf3655625ba6.tar.xz |
Merge branch 'for-4.4/hotplug' into libnvdimm-for-next
Diffstat (limited to 'arch/s390/boot/compressed/Makefile')
-rw-r--r-- | arch/s390/boot/compressed/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/boot/compressed/Makefile b/arch/s390/boot/compressed/Makefile index d4788111c161..fac6ac9790fa 100644 --- a/arch/s390/boot/compressed/Makefile +++ b/arch/s390/boot/compressed/Makefile @@ -10,7 +10,7 @@ targets += misc.o piggy.o sizes.h head.o KBUILD_CFLAGS := -m64 -D__KERNEL__ $(LINUX_INCLUDE) -O2 KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING -KBUILD_CFLAGS += $(cflags-y) -fno-delete-null-pointer-checks +KBUILD_CFLAGS += $(cflags-y) -fno-delete-null-pointer-checks -msoft-float KBUILD_CFLAGS += $(call cc-option,-mpacked-stack) KBUILD_CFLAGS += $(call cc-option,-ffreestanding) |