Commit c4a6eb3b 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: (48 commits)
  [S390] topology: export cpu topology via proc/sysinfo
  [S390] topology: move topology sysinfo code
  [S390] topology: clean up facility detection
  [S390] cleanup facility list handling
  [S390] enable ARCH_DMA_ADDR_T_64BIT with 64BIT
  [S390] dasd: ignore unsolicited interrupts for DIAG
  [S390] kvm: Enable z196 instruction facilities
  [S390] dasd: fix unsolicited interrupt recognition
  [S390] dasd: fix use after free in dbf
  [S390] kvm: Fix badness at include/asm/mmu_context.h:83
  [S390] cio: fix I/O cancel function
  [S390] topology: change default
  [S390] smp: use correct cpu address in print_cpu_info()
  [S390] remove ieee_instruction_pointer from thread_struct
  [S390] cleanup system call parameter setup
  [S390] correct alignment of cpuid structure
  [S390] cleanup lowcore access from external interrupts
  [S390] cleanup lowcore access from program checks
  [S390] pgtable: move pte_mkhuge() from hugetlb.h to pgtable.h
  [S390] fix SIGBUS handling
  ...
parents 33081adf 96f4a70d

Documentation/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -2438,7 +2438,7 @@ and is between 256 and 4096 characters. It is defined in the file 
			topology informations if the hardware supports these.

			The scheduler will make use of these informations and

			e.g. base its process migration decisions on it.

			Default is off.

			Default is on.



	tp720=		[HW,PS2]

arch/s390/Kbuild

0 → 100644
+6 −0
Original line number Diff line number Diff line 
obj-y += kernel/

obj-y += mm/

obj-y += crypto/

obj-y += appldata/

obj-y += hypfs/

obj-y += kvm/

arch/s390/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -60,6 +60,9 @@ config NO_IOMEM 
config NO_DMA

	def_bool y



config ARCH_DMA_ADDR_T_64BIT

	def_bool 64BIT



config GENERIC_LOCKBREAK

	bool

	default y
@@ -101,6 +104,7 @@ config S390 
	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_LZMA

	select HAVE_KERNEL_LZO

	select HAVE_GET_USER_PAGES_FAST

	select ARCH_INLINE_SPIN_TRYLOCK

	select ARCH_INLINE_SPIN_TRYLOCK_BH

	select ARCH_INLINE_SPIN_LOCK
@@ -286,6 +290,14 @@ config MARCH_Z10 
	  machines such as the z990, z890, z900, z800, z9-109, z9-ec

	  and z9-bc.



config MARCH_Z196

	bool "IBM zEnterprise 196"

	help

	  Select this to enable optimizations for IBM zEnterprise 196.

	  The kernel will be slightly faster but will not work on older

	  machines such as the z990, z890, z900, z800, z9-109, z9-ec,

	  z9-bc, z10-ec and z10-bc.



endchoice



config PACK_STACK

arch/s390/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ cflags-$(CONFIG_MARCH_Z900) += $(call cc-option,-march=z900) 
cflags-$(CONFIG_MARCH_Z990) += $(call cc-option,-march=z990)

cflags-$(CONFIG_MARCH_Z9_109) += $(call cc-option,-march=z9-109)

cflags-$(CONFIG_MARCH_Z10) += $(call cc-option,-march=z10)

cflags-$(CONFIG_MARCH_Z196) += $(call cc-option,-march=z196)



#KBUILD_IMAGE is necessary for make rpm

KBUILD_IMAGE	:=arch/s390/boot/image
@@ -94,8 +95,8 @@ 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/

# See arch/s390/Kbuild for content of core part of the kernel

core-y		+= arch/s390/



libs-y		+= arch/s390/lib/

drivers-y	+= drivers/s390/

arch/s390/crypto/crypt_s390.h

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ static inline int crypt_s390_func_available(int func) 
	int ret;



	/* check if CPACF facility (bit 17) is available */

	if (!(stfl() & 1ULL << (31 - 17)))

	if (!test_facility(17))

		return 0;



	switch (func & CRYPT_S390_OP_MASK) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE