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

Commit 409ab140 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] fix alloc_pgste check in init_new_context
  [S390] oprofile: fix min/max interval query checks
  [S390] replace diag10() with diag10_range() function
  [S390] disassembler: handle b280/spp instruction
  [S390] kernel: Initialize register 14 when starting new CPU
  [S390] dasd: prevent IO error during reserve/release loop
  [S390] sclp/memory hotplug: fix initial usecount of increments
parents ce845377 badb8bb9

arch/s390/include/asm/diag.h

+15 −2
Original line number Diff line number Diff line
@@ -9,9 +9,22 @@ 
#define _ASM_S390_DIAG_H



/*

 * Diagnose 10: Release pages

 * Diagnose 10: Release page range

 */

extern void diag10(unsigned long addr);

static inline void diag10_range(unsigned long start_pfn, unsigned long num_pfn)

{

	unsigned long start_addr, end_addr;



	start_addr = start_pfn << PAGE_SHIFT;

	end_addr = (start_pfn + num_pfn - 1) << PAGE_SHIFT;



	asm volatile(

		"0:	diag	%0,%1,0x10\n"

		"1:\n"

		EX_TABLE(0b, 1b)

		EX_TABLE(1b, 1b)

		: : "a" (start_addr), "a" (end_addr));

}



/*

 * Diagnose 14: Input spool file manipulation

arch/s390/include/asm/mmu_context.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ static inline int init_new_context(struct task_struct *tsk, 
#ifdef CONFIG_64BIT

	mm->context.asce_bits |= _ASCE_TYPE_REGION3;

#endif

	if (current->mm->context.alloc_pgste) {

	if (current->mm && current->mm->context.alloc_pgste) {

		/*

		 * alloc_pgste indicates, that any NEW context will be created

		 * with extended page tables. The old context is unchanged. The

arch/s390/kernel/diag.c

+0 −21
Original line number Diff line number Diff line
@@ -8,27 +8,6 @@ 
#include <linux/module.h>

#include <asm/diag.h>



/*

 * Diagnose 10: Release pages

 */

void diag10(unsigned long addr)

{

	if (addr >= 0x7ff00000)

		return;

	asm volatile(

#ifdef CONFIG_64BIT

		"	sam31\n"

		"	diag	%0,%0,0x10\n"

		"0:	sam64\n"

#else

		"	diag	%0,%0,0x10\n"

		"0:\n"

#endif

		EX_TABLE(0b, 0b)

		: : "a" (addr));

}

EXPORT_SYMBOL(diag10);



/*

 * Diagnose 14: Input spool file manipulation

 */

arch/s390/kernel/dis.c

+1 −0
Original line number Diff line number Diff line
@@ -672,6 +672,7 @@ static struct insn opcode_b2[] = { 
	{ "rp", 0x77, INSTR_S_RD },

	{ "stcke", 0x78, INSTR_S_RD },

	{ "sacf", 0x79, INSTR_S_RD },

	{ "spp", 0x80, INSTR_S_RD },

	{ "stsi", 0x7d, INSTR_S_RD },

	{ "srnm", 0x99, INSTR_S_RD },

	{ "stfpc", 0x9c, INSTR_S_RD },

arch/s390/kernel/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -836,7 +836,7 @@ restart_base: 
	stosm	__SF_EMPTY(%r15),0x04	# now we can turn dat on

	basr	%r14,0

	l	%r14,restart_addr-.(%r14)

	br	%r14			# branch to start_secondary

	basr	%r14,%r14		# branch to start_secondary

restart_addr:

	.long	start_secondary

	.align	8