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

Commit 26847fa6 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 updates from Martin Schwidefsky:
 "This it the second batch of s390 patches for the 3.6 merge window.
  Included is enablement for two common code changes, killable page
  faults and sorted exception tables.  And the regular set of cleanup
  and bug fix patches."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: make use of user_mode() macro where possible
  s390/mm: rename user_mode variable to addressing_mode
  s390/mm: fix fault handling for page table walk case
  s390/mm: make page faults killable
  s390: update defconfig
  s390/mm: downgrade page table after fork of a 31 bit process
  s390/ipl: Use diagnose 8 command separation
  s390/linker script: use RO_DATA_SECTION
  s390/exceptions: sort exception table at build time
  s390/debug: remove module_exit function / move EXPORT_SYMBOLs
parents 08843b79 7d256175

arch/s390/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ config S390 
	select HAVE_MEMBLOCK_NODE_MAP

	select HAVE_CMPXCHG_LOCAL

	select ARCH_DISCARD_MEMBLOCK

	select BUILDTIME_EXTABLE_SORT

	select ARCH_INLINE_SPIN_TRYLOCK

	select ARCH_INLINE_SPIN_TRYLOCK_BH

	select ARCH_INLINE_SPIN_LOCK

arch/s390/defconfig

+3 −2
Original line number Diff line number Diff line
@@ -7,6 +7,9 @@ CONFIG_TASK_DELAY_ACCT=y 
CONFIG_TASK_XACCT=y

CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_AUDIT=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_RCU_FAST_NO_HZ=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_CGROUPS=y
@@ -35,8 +38,6 @@ CONFIG_MODVERSIONS=y 
CONFIG_PARTITION_ADVANCED=y

CONFIG_IBM_PARTITION=y

CONFIG_DEFAULT_DEADLINE=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_PREEMPT=y

CONFIG_MEMORY_HOTPLUG=y

CONFIG_MEMORY_HOTREMOVE=y

arch/s390/include/asm/mmu_context.h

+14 −2
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <asm/uaccess.h>

#include <asm/tlbflush.h>

#include <asm/ctl_reg.h>

#include <asm-generic/mm_hooks.h>



static inline int init_new_context(struct task_struct *tsk,

				   struct mm_struct *mm)
@@ -58,7 +57,7 @@ static inline void update_mm(struct mm_struct *mm, struct task_struct *tsk) 
	pgd_t *pgd = mm->pgd;



	S390_lowcore.user_asce = mm->context.asce_bits | __pa(pgd);

	if (user_mode != HOME_SPACE_MODE) {

	if (addressing_mode != HOME_SPACE_MODE) {

		/* Load primary space page table origin. */

		asm volatile(LCTL_OPCODE" 1,1,%0\n"

			     : : "m" (S390_lowcore.user_asce) );
@@ -91,4 +90,17 @@ static inline void activate_mm(struct mm_struct *prev, 
        switch_mm(prev, next, current);

}



static inline void arch_dup_mmap(struct mm_struct *oldmm,

				 struct mm_struct *mm)

{

#ifdef CONFIG_64BIT

	if (oldmm->context.asce_limit < mm->context.asce_limit)

		crst_table_downgrade(mm, oldmm->context.asce_limit);

#endif

}



static inline void arch_exit_mmap(struct mm_struct *mm)

{

}



#endif /* __S390_MMU_CONTEXT_H */

arch/s390/include/asm/processor.h

+2 −0
Original line number Diff line number Diff line
@@ -120,7 +120,9 @@ struct stack_frame { 
	regs->psw.mask	= psw_user_bits | PSW_MASK_BA;			\

	regs->psw.addr	= new_psw | PSW_ADDR_AMODE;			\

	regs->gprs[15]	= new_stackp;					\

	__tlb_flush_mm(current->mm);					\

	crst_table_downgrade(current->mm, 1UL << 31);			\

	update_mm(current->mm, current);				\

} while (0)



/* Forward declaration, a strange C thing */

arch/s390/include/asm/setup.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ void create_mem_hole(struct mem_chunk memory_chunk[], unsigned long addr, 
#define SECONDARY_SPACE_MODE	2

#define HOME_SPACE_MODE		3



extern unsigned int user_mode;

extern unsigned int addressing_mode;



/*

 * Machine features detected in head.S