Commit 79811647 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: (35 commits)
  [S390] time: remove unused code
  [S390] zcore: Add prefix registers to dump header
  [S390] correct vdso version string
  [S390] add support for compressed kernels
  [S390] Define new s390 ELF note sections in elf.h
  [S390] codepage conversion of kernel parameter line
  [S390] seq_file: convert drivers/s390/
  [S390] add z9-ec/z10 instruction to kernel disassembler
  [S390] dasd: correct offline processing
  [S390] dasd: fix refcounting.
  [S390] dasd: fix online/offline race
  [S390] use kprobes_built_in() in mm/fault code
  [S390] bug: use relative pointers in bug table entries
  [S390] Cleanup struct _lowcore usage and defines.
  [S390] free_initmem: reduce code duplication
  [S390] Replace ENOTSUPP usage with EOPNOTSUPP
  [S390] spinlock: check virtual cpu running status
  [S390] sysinfo: fix SYSIB 3,2,2 structure
  [S390] add MACHINE_IS_LPAR flag
  [S390] qdio: optimize cache line usage of struct qdio_irq
  ...
parents f1dd6ad5 a8d6356c

Documentation/s390/CommonIO

+6 −0
Original line number Diff line number Diff line
@@ -87,6 +87,12 @@ Command line parameters 
  compatibility, by the device number in hexadecimal (0xabcd or abcd). Device

  numbers given as 0xabcd will be interpreted as 0.0.abcd.



* /proc/cio_settle



  A write request to this file is blocked until all queued cio actions are

  handled. This will allow userspace to wait for pending work affecting

  device availability after changing cio_ignore or the hardware configuration.



* For some of the information present in the /proc filesystem in 2.4 (namely,

  /proc/subchannels and /proc/chpids), see driver-model.txt.

  Information formerly in /proc/irq_count is now in /proc/interrupts.

Documentation/s390/driver-model.txt

+2 −2
Original line number Diff line number Diff line
@@ -223,8 +223,8 @@ touched by the driver - it should use the ccwgroup device's driver_data for its 
private data.



To implement a ccwgroup driver, please refer to include/asm/ccwgroup.h. Keep in

mind that most drivers will need to implement both a ccwgroup and a ccw driver

(unless you have a meta ccw driver, like cu3088 for lcs and ctc).

mind that most drivers will need to implement both a ccwgroup and a ccw

driver.





2. Channel paths

arch/s390/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ config GENERIC_BUG 
	depends on BUG

	default y



config GENERIC_BUG_RELATIVE_POINTERS

	def_bool y



config NO_IOMEM

	def_bool y
@@ -95,6 +98,9 @@ config S390 
	select HAVE_ARCH_TRACEHOOK

	select INIT_ALL_POSSIBLE

	select HAVE_PERF_EVENTS

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_LZMA

	select ARCH_INLINE_SPIN_TRYLOCK

	select ARCH_INLINE_SPIN_TRYLOCK_BH

	select ARCH_INLINE_SPIN_LOCK

arch/s390/Kconfig.debug

+13 −0
Original line number Diff line number Diff line
@@ -6,4 +6,17 @@ config TRACE_IRQFLAGS_SUPPORT 


source "lib/Kconfig.debug"



config DEBUG_STRICT_USER_COPY_CHECKS

	bool "Strict user copy size checks"

	---help---

	  Enabling this option turns a certain set of sanity checks for user

	  copy operations into compile time warnings.



	  The copy_from_user() etc checks are there to help test if there

	  are sufficient security checks on the length argument of

	  the copy operation, by having gcc prove that the argument is

	  within bounds.



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



endmenu

arch/s390/Makefile

+10 −3
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#



ifndef CONFIG_64BIT

LD_BFD		:= elf32-s390

LDFLAGS		:= -m elf_s390

KBUILD_CFLAGS	+= -m31

KBUILD_AFLAGS	+= -m31
@@ -21,6 +22,7 @@ UTS_MACHINE := s390 
STACK_SIZE	:= 8192

CHECKFLAGS	+= -D__s390__ -msize-long

else

LD_BFD		:= elf64-s390

LDFLAGS		:= -m elf64_s390

MODFLAGS	+= -fpic -D__PIC__

KBUILD_CFLAGS	+= -m64
@@ -30,6 +32,8 @@ STACK_SIZE := 16384 
CHECKFLAGS	+= -D__s390__ -D__s390x__

endif



export LD_BFD



cflags-$(CONFIG_MARCH_G5)   += $(call cc-option,-march=g5)

cflags-$(CONFIG_MARCH_Z900) += $(call cc-option,-march=z900)

cflags-$(CONFIG_MARCH_Z990) += $(call cc-option,-march=z990)
@@ -85,7 +89,9 @@ KBUILD_AFLAGS += $(aflags-y) 
OBJCOPYFLAGS	:= -O binary

LDFLAGS_vmlinux := -e start



head-y		:= arch/s390/kernel/head.o arch/s390/kernel/init_task.o

head-y		:= arch/s390/kernel/head.o

head-y		+= arch/s390/kernel/$(if $(CONFIG_64BIT),head64.o,head31.o)

head-y		+= arch/s390/kernel/init_task.o



core-y		+= arch/s390/mm/ arch/s390/kernel/ arch/s390/crypto/ \

		   arch/s390/appldata/ arch/s390/hypfs/ arch/s390/kvm/
@@ -99,12 +105,12 @@ drivers-$(CONFIG_OPROFILE) += arch/s390/oprofile/ 


boot		:= arch/s390/boot



all: image

all: image bzImage



install: vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $@



image: vmlinux

image bzImage: vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@



zfcpdump:
@@ -116,4 +122,5 @@ archclean: 
# Don't use tabs in echo arguments

define archhelp

  echo  '* image           - Kernel image for IPL ($(boot)/image)'

  echo	'* bzImage         - Compressed kernel image for IPL ($(boot)/bzImage)'

endef

CRA Git | Maintained and supported by SUSTech CRA and CCSE