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

Commit 31598e87 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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] kexec: Disable ftrace during kexec
  [S390] support XZ compressed kernel
  [S390] css_bus_type: make it static
  [S390] css_driver: remove duplicate members
  [S390] css: remove subchannel private
  [S390] css: move chsc_private to drv_data
  [S390] css: move io_private to drv_data
  [S390] cio: move cdev pointer to io_subchannel_private
  [S390] cio: move options to io_sch_private
  [S390] cio: move asms to generic header
  [S390] cio: move orb definitions to separate header
  [S390] Write protect module text and RO data
  [S390] dasd: get rid of compile warning
  [S390] remove superfluous check from do_IRQ
  [S390] remove redundant stack check option
parents 241eb956 6966727d

arch/s390/Kconfig

+6 −15
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ config S390 
	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_LZMA

	select HAVE_KERNEL_LZO

	select HAVE_KERNEL_XZ

	select HAVE_GET_USER_PAGES_FAST

	select HAVE_ARCH_MUTEX_CPU_RELAX

	select ARCH_INLINE_SPIN_TRYLOCK
@@ -341,26 +342,16 @@ config STACK_GUARD 
	  The minimum size for the stack guard should be 256 for 31 bit and

	  512 for 64 bit.



config WARN_STACK

config WARN_DYNAMIC_STACK

	def_bool n

	prompt "Emit compiler warnings for function with broken stack usage"

	prompt "Emit compiler warnings for function with dynamic stack usage"

	help

	  This option enables the compiler options -mwarn-framesize and

	  -mwarn-dynamicstack. If the compiler supports these options it

	  will generate warnings for function which either use alloca or

	  create a stack frame bigger than CONFIG_WARN_STACK_SIZE.

	  This option enables the compiler option -mwarn-dynamicstack. If the

	  compiler supports this options generates warnings for functions

	  that dynamically allocate stack space using alloca.



	  Say N if you are unsure.



config WARN_STACK_SIZE

	int "Maximum frame size considered safe (128-2048)"

	range 128 2048

	depends on WARN_STACK

	default "2048"

	help

	  This allows you to specify the maximum frame size a function may

	  have without the compiler complaining about it.



config ARCH_POPULATES_NODE_MAP

	def_bool y

arch/s390/Kconfig.debug

+3 −0
Original line number Diff line number Diff line
@@ -31,4 +31,7 @@ config DEBUG_STRICT_USER_COPY_CHECKS 


	  If unsure, or if you run an older (pre 4.4) gcc, say N.



config DEBUG_SET_MODULE_RONX

	def_bool y

	depends on MODULES

endmenu

arch/s390/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -80,8 +80,7 @@ endif 
endif



ifeq ($(call cc-option-yn,-mwarn-dynamicstack),y)

cflags-$(CONFIG_WARN_STACK) += -mwarn-dynamicstack

cflags-$(CONFIG_WARN_STACK) += -mwarn-framesize=$(CONFIG_WARN_STACK_SIZE)

cflags-$(CONFIG_WARN_DYNAMIC_STACK) += -mwarn-dynamicstack

endif



KBUILD_CFLAGS	+= -mbackchain -msoft-float $(cflags-y)

arch/s390/boot/compressed/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ 
BITS := $(if $(CONFIG_64BIT),64,31)



targets	:= vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 \

	   vmlinux.bin.lzma vmlinux.bin.lzo misc.o piggy.o sizes.h head$(BITS).o

	   vmlinux.bin.xz vmlinux.bin.lzma vmlinux.bin.lzo misc.o piggy.o \

	   sizes.h head$(BITS).o



KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2

KBUILD_CFLAGS += $(cflags-y)
@@ -48,6 +49,7 @@ suffix-$(CONFIG_KERNEL_GZIP) := gz 
suffix-$(CONFIG_KERNEL_BZIP2) := bz2

suffix-$(CONFIG_KERNEL_LZMA)  := lzma

suffix-$(CONFIG_KERNEL_LZO)  := lzo

suffix-$(CONFIG_KERNEL_XZ)  := xz



$(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y)

	$(call if_changed,gzip)
@@ -57,6 +59,8 @@ $(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) 
	$(call if_changed,lzma)

$(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y)

	$(call if_changed,lzo)

$(obj)/vmlinux.bin.xz: $(vmlinux.bin.all-y)

	$(call if_changed,xzkern)



LDFLAGS_piggy.o := -r --format binary --oformat $(LD_BFD) -T

$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.$(suffix-y)

arch/s390/boot/compressed/misc.c

+5 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#undef memset

#undef memcpy

#undef memmove

#define memmove memmove

#define memzero(s, n) memset((s), 0, (n))



/* Symbols defined by linker scripts */
@@ -54,6 +55,10 @@ static unsigned long free_mem_end_ptr; 
#include "../../../../lib/decompress_unlzo.c"

#endif



#ifdef CONFIG_KERNEL_XZ

#include "../../../../lib/decompress_unxz.c"

#endif



extern _sclp_print_early(const char *);



int puts(const char *s)