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

Commit 34258a32 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:
 "Assorted bug fixes, the mlock2 system call gets added, and one
  improvement.  The boot from dasd devices is now possible from a wider
  range of devices"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: remove SALIPL loader
  s390: wire up mlock2 system call
  s390: remove g5 elf platform support
  s390: avoid cache aliasing under z/VM and KVM
  s390/sclp: _sclp_wait_int(): retain full PSW mask
  s390/zcrypt: Fix initialisation when zcrypt is built-in
  s390/zcrypt: Fix kernel crash on systems without AP bus support
  s390: add support for ipl devices in subchannel sets > 0
  s390/ipl: fix out of bounds access in scpdata_write
  s390/pci_dma: improve debugging of errors during dma map
  s390/pci_dma: handle dma table failures
  s390/pci_dma: unify label of invalid translation table entries
  s390/syscalls: remove system call number calculation
  s390/cio: simplify css_generate_pgid
  s390/diag: add a s390 prefix to the diagnose trace point
  s390/head: fix error message on unsupported hardware
parents 0d77a123 f52c74fe

arch/s390/include/asm/cio.h

+1 −0
Original line number Diff line number Diff line
@@ -312,6 +312,7 @@ extern void css_schedule_reprobe(void); 
extern void reipl_ccw_dev(struct ccw_dev_id *id);



struct cio_iplinfo {

	u8 ssid;

	u16 devno;

	int is_qdio;

};

arch/s390/include/asm/elf.h

+10 −3
Original line number Diff line number Diff line
@@ -206,9 +206,16 @@ do { \ 
} while (0)

#endif /* CONFIG_COMPAT */



extern unsigned long mmap_rnd_mask;



#define STACK_RND_MASK	(test_thread_flag(TIF_31BIT) ? 0x7ff : mmap_rnd_mask)

/*

 * Cache aliasing on the latest machines calls for a mapping granularity

 * of 512KB. For 64-bit processes use a 512KB alignment and a randomization

 * of up to 1GB. For 31-bit processes the virtual address space is limited,

 * use no alignment and limit the randomization to 8MB.

 */

#define BRK_RND_MASK	(is_32bit_task() ? 0x7ffUL : 0x3ffffUL)

#define MMAP_RND_MASK	(is_32bit_task() ? 0x7ffUL : 0x3ff80UL)

#define MMAP_ALIGN_MASK	(is_32bit_task() ? 0 : 0x7fUL)

#define STACK_RND_MASK	MMAP_RND_MASK



#define ARCH_DLINFO							    \

do {									    \

arch/s390/include/asm/ipl.h

+2 −1
Original line number Diff line number Diff line
@@ -64,7 +64,8 @@ struct ipl_block_fcp { 


struct ipl_block_ccw {

	u8  reserved1[84];

	u8  reserved2[2];

	u16 reserved2 : 13;

	u8  ssid : 3;

	u16 devno;

	u8  vm_flags;

	u8  reserved3[3];

arch/s390/include/asm/pci_dma.h

+3 −1
Original line number Diff line number Diff line
@@ -195,5 +195,7 @@ void zpci_dma_exit_device(struct zpci_dev *); 
void dma_free_seg_table(unsigned long);

unsigned long *dma_alloc_cpu_table(void);

void dma_cleanup_tables(unsigned long *);

void dma_update_cpu_trans(unsigned long *, void *, dma_addr_t, int);

unsigned long *dma_walk_cpu_trans(unsigned long *rto, dma_addr_t dma_addr);

void dma_update_cpu_trans(unsigned long *entry, void *page_addr, int flags);



#endif

arch/s390/include/asm/trace/diag.h

+3 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#define TRACE_INCLUDE_PATH asm/trace

#define TRACE_INCLUDE_FILE diag



TRACE_EVENT(diagnose,

TRACE_EVENT(s390_diagnose,

	TP_PROTO(unsigned short nr),

	TP_ARGS(nr),

	TP_STRUCT__entry(
@@ -32,9 +32,9 @@ TRACE_EVENT(diagnose, 
);



#ifdef CONFIG_TRACEPOINTS

void trace_diagnose_norecursion(int diag_nr);

void trace_s390_diagnose_norecursion(int diag_nr);

#else

static inline void trace_diagnose_norecursion(int diag_nr) { }

static inline void trace_s390_diagnose_norecursion(int diag_nr) { }

#endif



#endif /* _TRACE_S390_DIAG_H */