Commit cc106eb3 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] fill out file list in s390 MAINTAINERS entry
  [S390] Add support for LZO-compressed kernels.
  [S390] cmm: get rid of CMM_PROC config option
  [S390] cmm: remove superfluous EXPORT_SYMBOLs plus cleanups
  [S390] dasd: unit check handling during internal cio I/O
  [S390] cio: unit check handling during internal I/O
  [S390] ccwgroup: add locking around drvdata access
  [S390] cio: remove stsch
  [S390] spp: remove KVM_AWARE_CMF config option
  [S390] kprobes: forbid probing of stnsm/stosm/epsw
  [S390] spp: fix compilation for CONFIG_32BIT
  [S390] atomic: implement atomic64_dec_if_positive
  [S390] cmm: fix crash on module unload
parents 4e455c67 3bfe6858

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -4836,6 +4836,9 @@ W: http://www.ibm.com/developerworks/linux/linux390/ 
S:	Supported

F:	arch/s390/

F:	drivers/s390/

F:	fs/partitions/ibm.c

F:	Documentation/s390/

F:	Documentation/DocBook/s390*



S390 NETWORK DRIVERS

M:	Ursula Braun <ursula.braun@de.ibm.com>

arch/s390/Kconfig

+1 −7
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ config S390 
	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_LZMA

	select HAVE_KERNEL_LZO

	select ARCH_INLINE_SPIN_TRYLOCK

	select ARCH_INLINE_SPIN_TRYLOCK_BH

	select ARCH_INLINE_SPIN_LOCK
@@ -479,13 +480,6 @@ config CMM 
	  Everybody who wants to run Linux under VM should select this

	  option.



config CMM_PROC

	bool "/proc interface to cooperative memory management"

	depends on CMM

	help

	  Select this option to enable the /proc interface to the

	  cooperative memory management.



config CMM_IUCV

	bool "IUCV special message interface to cooperative memory management"

	depends on CMM && (SMSGIUCV=y || CMM=SMSGIUCV)

arch/s390/boot/compressed/Makefile

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



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

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

	   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)
@@ -47,6 +47,7 @@ vmlinux.bin.all-y := $(obj)/vmlinux.bin 
suffix-$(CONFIG_KERNEL_GZIP)  := gz

suffix-$(CONFIG_KERNEL_BZIP2) := bz2

suffix-$(CONFIG_KERNEL_LZMA)  := lzma

suffix-$(CONFIG_KERNEL_LZO)  := lzo



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

	$(call if_changed,gzip)
@@ -54,6 +55,8 @@ $(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y) 
	$(call if_changed,bzip2)

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

	$(call if_changed,lzma)

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

	$(call if_changed,lzo)



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

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ static unsigned long free_mem_end_ptr; 
#include "../../../../lib/decompress_unlzma.c"

#endif



#ifdef CONFIG_KERNEL_LZO

#include "../../../../lib/decompress_unlzo.c"

#endif



extern _sclp_print_early(const char *);



int puts(const char *s)

arch/s390/include/asm/atomic.h

+19 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 


#include <linux/compiler.h>

#include <linux/types.h>

#include <asm/system.h>



#define ATOMIC_INIT(i)  { (i) }
@@ -274,6 +275,7 @@ static inline void atomic64_clear_mask(unsigned long long mask, atomic64_t *v) 
static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)

{

	long long c, old;



	c = atomic64_read(v);

	for (;;) {

		if (unlikely(c == u))
@@ -286,6 +288,23 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u) 
	return c != u;

}



static inline long long atomic64_dec_if_positive(atomic64_t *v)

{

	long long c, old, dec;



	c = atomic64_read(v);

	for (;;) {

		dec = c - 1;

		if (unlikely(dec < 0))

			break;

		old = atomic64_cmpxchg((v), c, dec);

		if (likely(old == c))

			break;

		c = old;

	}

	return dec;

}



#define atomic64_add(_i, _v)		atomic64_add_return(_i, _v)

#define atomic64_add_negative(_i, _v)	(atomic64_add_return(_i, _v) < 0)

#define atomic64_inc(_v)		atomic64_add_return(1, _v)

CRA Git | Maintained and supported by SUSTech CRA and CCSE