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

Commit 991657a3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 fixes from Martin Schwidefsky:
 "A couple of bug fixes, the most hairy on is the flush_tlb_kernel_range
  fix.  Another case of "how could this ever have worked?"."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/kdump: Do not add standby memory for kdump
  drivers/i2c: remove !S390 dependency, add missing GENERIC_HARDIRQS dependencies
  s390/scm: process availability
  s390/scm_blk: suspend writes
  s390/scm_drv: extend notify callback
  s390/scm_blk: fix request number accounting
  s390/mm: fix flush_tlb_kernel_range()
  s390/mm: fix vmemmap size calculation
  s390: critical section cleanup vs. machine checks
parents 1c6ba37b 52319b45

arch/s390/include/asm/eadm.h

+5 −1
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ struct arsb { 
	u32 reserved[4];

} __packed;



#define EQC_WR_PROHIBIT 22



struct msb {

	u8 fmt:4;

	u8 oc:4;
@@ -96,11 +98,13 @@ struct scm_device { 
#define OP_STATE_TEMP_ERR	2

#define OP_STATE_PERM_ERR	3



enum scm_event {SCM_CHANGE, SCM_AVAIL};



struct scm_driver {

	struct device_driver drv;

	int (*probe) (struct scm_device *scmdev);

	int (*remove) (struct scm_device *scmdev);

	void (*notify) (struct scm_device *scmdev);

	void (*notify) (struct scm_device *scmdev, enum scm_event event);

	void (*handler) (struct scm_device *scmdev, void *data, int error);

};

arch/s390/include/asm/tlbflush.h

+0 −2
Original line number Diff line number Diff line
@@ -74,8 +74,6 @@ static inline void __tlb_flush_idte(unsigned long asce) 


static inline void __tlb_flush_mm(struct mm_struct * mm)

{

	if (unlikely(cpumask_empty(mm_cpumask(mm))))

		return;

	/*

	 * If the machine has IDTE we prefer to do a per mm flush

	 * on all cpus instead of doing a local flush if the mm

arch/s390/kernel/entry.S

+2 −1
Original line number Diff line number Diff line
@@ -636,7 +636,8 @@ ENTRY(mcck_int_handler) 
	UPDATE_VTIME %r14,%r15,__LC_MCCK_ENTER_TIMER

mcck_skip:

	SWITCH_ASYNC __LC_GPREGS_SAVE_AREA+32,__LC_PANIC_STACK,PAGE_SHIFT

	mvc	__PT_R0(64,%r11),__LC_GPREGS_SAVE_AREA

	stm	%r0,%r7,__PT_R0(%r11)

	mvc	__PT_R8(32,%r11),__LC_GPREGS_SAVE_AREA+32

	stm	%r8,%r9,__PT_PSW(%r11)

	xc	__SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15)

	l	%r1,BASED(.Ldo_machine_check)

arch/s390/kernel/entry64.S

+3 −2
Original line number Diff line number Diff line
@@ -678,8 +678,9 @@ ENTRY(mcck_int_handler) 
	UPDATE_VTIME %r14,__LC_MCCK_ENTER_TIMER

	LAST_BREAK %r14

mcck_skip:

	lghi	%r14,__LC_GPREGS_SAVE_AREA

	mvc	__PT_R0(128,%r11),0(%r14)

	lghi	%r14,__LC_GPREGS_SAVE_AREA+64

	stmg	%r0,%r7,__PT_R0(%r11)

	mvc	__PT_R8(64,%r11),0(%r14)

	stmg	%r8,%r9,__PT_PSW(%r11)

	xc	__SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)

	lgr	%r2,%r11		# pass pointer to pt_regs

arch/s390/kernel/setup.c

+2 −0
Original line number Diff line number Diff line
@@ -571,6 +571,8 @@ static void __init setup_memory_end(void) 


	/* Split remaining virtual space between 1:1 mapping & vmemmap array */

	tmp = VMALLOC_START / (PAGE_SIZE + sizeof(struct page));

	/* vmemmap contains a multiple of PAGES_PER_SECTION struct pages */

	tmp = SECTION_ALIGN_UP(tmp);

	tmp = VMALLOC_START - tmp * sizeof(struct page);

	tmp &= ~((vmax >> 11) - 1);	/* align to page table level */

	tmp = min(tmp, 1UL << MAX_PHYSMEM_BITS);