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

Commit f85cca6b 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] net: provide architecture specific NET_SKB_PAD
  [S390] atomic: use inline asm
  [S390] correct ipl parameter block safe guard
  [S390] atomic: use ACCESS_ONCE() for atomic_read()
  [S390] dasd: correct device table
parents 6f576d57 dd30ac32

arch/s390/boot/compressed/misc.c

+3 −2
Original line number Diff line number Diff line
@@ -133,11 +133,12 @@ unsigned long decompress_kernel(void) 
	unsigned long output_addr;

	unsigned char *output;



	check_ipl_parmblock((void *) 0, (unsigned long) output + SZ__bss_start);

	output_addr = ((unsigned long) &_end + HEAP_SIZE + 4095UL) & -4096UL;

	check_ipl_parmblock((void *) 0, output_addr + SZ__bss_start);

	memset(&_bss, 0, &_ebss - &_bss);

	free_mem_ptr = (unsigned long)&_end;

	free_mem_end_ptr = free_mem_ptr + HEAP_SIZE;

	output = (unsigned char *) ((free_mem_end_ptr + 4095UL) & -4096UL);

	output = (unsigned char *) output_addr;



#ifdef CONFIG_BLK_DEV_INITRD

	/*

arch/s390/include/asm/atomic.h

+18 −8
Original line number Diff line number Diff line
@@ -36,14 +36,19 @@ 


static inline int atomic_read(const atomic_t *v)

{

	barrier();

	return v->counter;

	int c;



	asm volatile(

		"	l	%0,%1\n"

		: "=d" (c) : "Q" (v->counter));

	return c;

}



static inline void atomic_set(atomic_t *v, int i)

{

	v->counter = i;

	barrier();

	asm volatile(

		"	st	%1,%0\n"

		: "=Q" (v->counter) : "d" (i));

}



static inline int atomic_add_return(int i, atomic_t *v)
@@ -128,14 +133,19 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u) 


static inline long long atomic64_read(const atomic64_t *v)

{

	barrier();

	return v->counter;

	long long c;



	asm volatile(

		"	lg	%0,%1\n"

		: "=d" (c) : "Q" (v->counter));

	return c;

}



static inline void atomic64_set(atomic64_t *v, long long i)

{

	v->counter = i;

	barrier();

	asm volatile(

		"	stg	%1,%0\n"

		: "=Q" (v->counter) : "d" (i));

}



static inline long long atomic64_add_return(long long i, atomic64_t *v)

arch/s390/include/asm/cache.h

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


#define L1_CACHE_BYTES     256

#define L1_CACHE_SHIFT     8

#define NET_SKB_PAD	   32



#define __read_mostly __attribute__((__section__(".data..read_mostly")))

drivers/s390/block/dasd_eckd.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static struct dasd_discipline dasd_eckd_discipline; 
static struct ccw_device_id dasd_eckd_ids[] = {

	{ CCW_DEVICE_DEVTYPE (0x3990, 0, 0x3390, 0), .driver_info = 0x1},

	{ CCW_DEVICE_DEVTYPE (0x2105, 0, 0x3390, 0), .driver_info = 0x2},

	{ CCW_DEVICE_DEVTYPE (0x3880, 0, 0x3390, 0), .driver_info = 0x3},

	{ CCW_DEVICE_DEVTYPE (0x3880, 0, 0x3380, 0), .driver_info = 0x3},

	{ CCW_DEVICE_DEVTYPE (0x3990, 0, 0x3380, 0), .driver_info = 0x4},

	{ CCW_DEVICE_DEVTYPE (0x2105, 0, 0x3380, 0), .driver_info = 0x5},

	{ CCW_DEVICE_DEVTYPE (0x9343, 0, 0x9345, 0), .driver_info = 0x6},