Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ec20e2e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 fixes from Martin Schwidefsky:
 "Three bug fixes and an update to the default configuration"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/defconfig: set SCSI_DH=y
  s390/vtime: correct scaled cputime of partially idle CPUs
  s390/boot/decompression: disable floating point in decompressor
  s390/numa: use correct type for node_to_cpumask_map
parents 3c68319b daad0bf1

arch/s390/boot/compressed/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -10,7 +10,7 @@ targets += misc.o piggy.o sizes.h head.o 




KBUILD_CFLAGS := -m64 -D__KERNEL__ $(LINUX_INCLUDE) -O2

KBUILD_CFLAGS := -m64 -D__KERNEL__ $(LINUX_INCLUDE) -O2

KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING

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,-mpacked-stack)

KBUILD_CFLAGS += $(call cc-option,-ffreestanding)

KBUILD_CFLAGS += $(call cc-option,-ffreestanding)

arch/s390/configs/default_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -381,7 +381,7 @@ CONFIG_ISCSI_TCP=m 
CONFIG_SCSI_DEBUG=m

CONFIG_SCSI_DEBUG=m

CONFIG_ZFCP=y

CONFIG_ZFCP=y

CONFIG_SCSI_VIRTIO=m

CONFIG_SCSI_VIRTIO=m

CONFIG_SCSI_DH=m

CONFIG_SCSI_DH=y

CONFIG_SCSI_DH_RDAC=m

CONFIG_SCSI_DH_RDAC=m

CONFIG_SCSI_DH_HP_SW=m

CONFIG_SCSI_DH_HP_SW=m

CONFIG_SCSI_DH_EMC=m

CONFIG_SCSI_DH_EMC=m

arch/s390/configs/gcov_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -377,7 +377,7 @@ CONFIG_ISCSI_TCP=m 
CONFIG_SCSI_DEBUG=m

CONFIG_SCSI_DEBUG=m

CONFIG_ZFCP=y

CONFIG_ZFCP=y

CONFIG_SCSI_VIRTIO=m

CONFIG_SCSI_VIRTIO=m

CONFIG_SCSI_DH=m

CONFIG_SCSI_DH=y

CONFIG_SCSI_DH_RDAC=m

CONFIG_SCSI_DH_RDAC=m

CONFIG_SCSI_DH_HP_SW=m

CONFIG_SCSI_DH_HP_SW=m

CONFIG_SCSI_DH_EMC=m

CONFIG_SCSI_DH_EMC=m

arch/s390/configs/performance_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -377,7 +377,7 @@ CONFIG_ISCSI_TCP=m 
CONFIG_SCSI_DEBUG=m

CONFIG_SCSI_DEBUG=m

CONFIG_ZFCP=y

CONFIG_ZFCP=y

CONFIG_SCSI_VIRTIO=m

CONFIG_SCSI_VIRTIO=m

CONFIG_SCSI_DH=m

CONFIG_SCSI_DH=y

CONFIG_SCSI_DH_RDAC=m

CONFIG_SCSI_DH_RDAC=m

CONFIG_SCSI_DH_HP_SW=m

CONFIG_SCSI_DH_HP_SW=m

CONFIG_SCSI_DH_EMC=m

CONFIG_SCSI_DH_EMC=m

arch/s390/include/asm/numa.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ int numa_pfn_to_nid(unsigned long pfn); 
int __node_distance(int a, int b);

int __node_distance(int a, int b);

void numa_update_cpu_topology(void);

void numa_update_cpu_topology(void);





extern cpumask_var_t node_to_cpumask_map[MAX_NUMNODES];

extern cpumask_t node_to_cpumask_map[MAX_NUMNODES];

extern int numa_debug_enabled;

extern int numa_debug_enabled;





#else

#else