Commit 19f2b8df authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] tape_3590.c: introduce missing kfree
  [S390] Fix __ctl_load/__ctl_store inline assembly constraints
  [S390] Fix build failure in __cpu_up()
  [S390] vt220 console, initialize list head before use
  [S390] cio: Fix inverted isc priorities.
  [S390] vmemmap: fix off-by-one bug.
  [S390] cio: Fix sparse warnings in blacklist.c.
  [S390] sparsemem: use SPARSEMEM_STATIC if !64BIT.
parents c592713b 1783e60f

arch/s390/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -304,6 +304,7 @@ config ARCH_SPARSEMEM_ENABLE 
	def_bool y

	def_bool y

	select SPARSEMEM_VMEMMAP_ENABLE

	select SPARSEMEM_VMEMMAP_ENABLE

	select SPARSEMEM_VMEMMAP

	select SPARSEMEM_VMEMMAP

	select SPARSEMEM_STATIC if !64BIT





config ARCH_SPARSEMEM_DEFAULT

config ARCH_SPARSEMEM_DEFAULT

	def_bool y

	def_bool y

arch/s390/kernel/smp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -711,7 +711,7 @@ int __cpuinit __cpu_up(unsigned int cpu) 
	memset(sf, 0, sizeof(struct stack_frame));

	memset(sf, 0, sizeof(struct stack_frame));

	sf->gprs[9] = (unsigned long) sf;

	sf->gprs[9] = (unsigned long) sf;

	cpu_lowcore->save_area[15] = (unsigned long) sf;

	cpu_lowcore->save_area[15] = (unsigned long) sf;

	__ctl_store(cpu_lowcore->cregs_save_area[0], 0, 15);

	__ctl_store(cpu_lowcore->cregs_save_area, 0, 15);

	asm volatile(

	asm volatile(

		"	stam	0,15,0(%0)"

		"	stam	0,15,0(%0)"

		: : "a" (&cpu_lowcore->access_regs_save_area) : "memory");

		: : "a" (&cpu_lowcore->access_regs_save_area) : "memory");

arch/s390/mm/vmem.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -236,7 +236,7 @@ static int insert_memory_segment(struct memory_segment *seg) 
{

{

	struct memory_segment *tmp;

	struct memory_segment *tmp;





	if (seg->start + seg->size >= VMEM_MAX_PHYS ||

	if (seg->start + seg->size > VMEM_MAX_PHYS ||

	    seg->start + seg->size < seg->start)

	    seg->start + seg->size < seg->start)

		return -ERANGE;

		return -ERANGE;

drivers/s390/char/sclp_vt220.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -773,6 +773,7 @@ sclp_vt220_con_init(void) 
{

{

	int rc;

	int rc;





	INIT_LIST_HEAD(&sclp_vt220_register.list);

	if (!CONSOLE_IS_SCLP)

	if (!CONSOLE_IS_SCLP)

		return 0;

		return 0;

	rc = __sclp_vt220_init();

	rc = __sclp_vt220_init();

drivers/s390/char/tape_3590.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1598,7 +1598,7 @@ tape_3590_setup_device(struct tape_device *device) 
	rc = tape_3590_read_dev_chars(device, rdc_data);

	rc = tape_3590_read_dev_chars(device, rdc_data);

	if (rc) {

	if (rc) {

		DBF_LH(3, "Read device characteristics failed!\n");

		DBF_LH(3, "Read device characteristics failed!\n");

		goto fail_kmalloc;

		goto fail_rdc_data;

	}

	}

	rc = tape_std_assign(device);

	rc = tape_std_assign(device);

	if (rc)

	if (rc)

CRA Git | Maintained and supported by SUSTech CRA and CCSE