Commit f144c78e 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: (21 commits)
  [S390] dasd: fix race condition in resume code
  [S390] Add EX_TABLE for addressing exception in usercopy functions.
  [S390] 64-bit register support for 31-bit processes
  [S390] hibernate: Use correct place for CPU address in lowcore
  [S390] pm: ignore time spend in suspended state
  [S390] zcrypt: Improve some comments
  [S390] zcrypt: Fix sparse warning.
  [S390] perf_counter: fix vdso detection
  [S390] ftrace: drop nmi protection
  [S390] compat: fix truncate system call wrapper
  [S390] Provide arch specific mdelay implementation.
  [S390] Fix enabled udelay for short delays.
  [S390] cio: allow setting boxed devices offline
  [S390] cio: make not operational handling consistent
  [S390] cio: make disconnected handling consistent
  [S390] Fix memory leak in /proc/cio_ignore
  [S390] cio: channel path memory leak
  [S390] module: fix memory leak in s390 module loader
  [S390] Enable kmemleak on s390.
  [S390] 3270 console build fix
  ...
parents ef1f7a7e 6fca97a9

arch/s390/include/asm/delay.h

+4 −3
Original line number Diff line number Diff line
@@ -14,10 +14,11 @@ 
#ifndef _S390_DELAY_H

#define _S390_DELAY_H



extern void __udelay(unsigned long usecs);

extern void udelay_simple(unsigned long usecs);

extern void __udelay(unsigned long long usecs);

extern void udelay_simple(unsigned long long usecs);

extern void __delay(unsigned long loops);



#define udelay(n) __udelay(n)

#define udelay(n) __udelay((unsigned long long) (n))

#define mdelay(n) __udelay((unsigned long long) (n) * 1000)



#endif /* defined(_S390_DELAY_H) */

arch/s390/include/asm/elf.h

+12 −0
Original line number Diff line number Diff line
@@ -92,6 +92,18 @@ 
/* Keep this the last entry.  */

#define R_390_NUM	61



/* Bits present in AT_HWCAP. */

#define HWCAP_S390_ESAN3	1

#define HWCAP_S390_ZARCH	2

#define HWCAP_S390_STFLE	4

#define HWCAP_S390_MSA		8

#define HWCAP_S390_LDISP	16

#define HWCAP_S390_EIMM		32

#define HWCAP_S390_DFP		64

#define HWCAP_S390_HPAGE	128

#define HWCAP_S390_ETF3EH	256

#define HWCAP_S390_HIGH_GPRS	512



/*

 * These are used to set parameters in the core dumps.

 */

arch/s390/include/asm/ptrace.h

+4 −0
Original line number Diff line number Diff line
@@ -311,6 +311,10 @@ typedef struct 
	__u32		orig_gpr2;

} s390_compat_regs;



typedef struct

{

	__u32		gprs_high[NUM_GPRS];

} s390_compat_regs_high;



#ifdef __KERNEL__

arch/s390/include/asm/ucontext.h

+15 −0
Original line number Diff line number Diff line
@@ -9,6 +9,21 @@ 
#ifndef _ASM_S390_UCONTEXT_H

#define _ASM_S390_UCONTEXT_H



#define UC_EXTENDED	0x00000001



#ifndef __s390x__



struct ucontext_extended {

	unsigned long	  uc_flags;

	struct ucontext  *uc_link;

	stack_t		  uc_stack;

	_sigregs	  uc_mcontext;

	unsigned long	  uc_sigmask[2];

	unsigned long	  uc_gprs_high[16];

};



#endif



struct ucontext {

	unsigned long	  uc_flags;

	struct ucontext  *uc_link;

arch/s390/kernel/compat_signal.c

+34 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ typedef struct 
	struct sigcontext32 sc;

	_sigregs32 sregs;

	int signo;

	__u32 gprs_high[NUM_GPRS];

	__u8 retcode[S390_SYSCALL_SIZE];

} sigframe32;
@@ -48,6 +49,7 @@ typedef struct 
	__u8 retcode[S390_SYSCALL_SIZE];

	compat_siginfo_t info;

	struct ucontext32 uc;

	__u32 gprs_high[NUM_GPRS];

} rt_sigframe32;



int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from)
@@ -344,6 +346,30 @@ static int restore_sigregs32(struct pt_regs *regs,_sigregs32 __user *sregs) 
	return 0;

}



static int save_sigregs_gprs_high(struct pt_regs *regs, __u32 __user *uregs)

{

	__u32 gprs_high[NUM_GPRS];

	int i;



	for (i = 0; i < NUM_GPRS; i++)

		gprs_high[i] = regs->gprs[i] >> 32;



	return __copy_to_user(uregs, &gprs_high, sizeof(gprs_high));

}



static int restore_sigregs_gprs_high(struct pt_regs *regs, __u32 __user *uregs)

{

	__u32 gprs_high[NUM_GPRS];

	int err, i;



	err = __copy_from_user(&gprs_high, uregs, sizeof(gprs_high));

	if (err)

		return err;

	for (i = 0; i < NUM_GPRS; i++)

		*(__u32 *)&regs->gprs[i] = gprs_high[i];

	return 0;

}



asmlinkage long sys32_sigreturn(void)

{

	struct pt_regs *regs = task_pt_regs(current);
@@ -363,6 +389,8 @@ asmlinkage long sys32_sigreturn(void) 


	if (restore_sigregs32(regs, &frame->sregs))

		goto badframe;

	if (restore_sigregs_gprs_high(regs, frame->gprs_high))

		goto badframe;



	return regs->gprs[2];
@@ -394,6 +422,8 @@ asmlinkage long sys32_rt_sigreturn(void) 


	if (restore_sigregs32(regs, &frame->uc.uc_mcontext))

		goto badframe;

	if (restore_sigregs_gprs_high(regs, frame->gprs_high))

		goto badframe;



	err = __get_user(ss_sp, &frame->uc.uc_stack.ss_sp);

	st.ss_sp = compat_ptr(ss_sp);
@@ -474,6 +504,8 @@ static int setup_frame32(int sig, struct k_sigaction *ka, 


	if (save_sigregs32(regs, &frame->sregs))

		goto give_sigsegv;

	if (save_sigregs_gprs_high(regs, frame->gprs_high))

		goto give_sigsegv;

	if (__put_user((unsigned long) &frame->sregs, &frame->sc.sregs))

		goto give_sigsegv;
@@ -529,13 +561,14 @@ static int setup_rt_frame32(int sig, struct k_sigaction *ka, siginfo_t *info, 
		goto give_sigsegv;



	/* Create the ucontext.  */

	err |= __put_user(0, &frame->uc.uc_flags);

	err |= __put_user(UC_EXTENDED, &frame->uc.uc_flags);

	err |= __put_user(0, &frame->uc.uc_link);

	err |= __put_user(current->sas_ss_sp, &frame->uc.uc_stack.ss_sp);

	err |= __put_user(sas_ss_flags(regs->gprs[15]),

	                  &frame->uc.uc_stack.ss_flags);

	err |= __put_user(current->sas_ss_size, &frame->uc.uc_stack.ss_size);

	err |= save_sigregs32(regs, &frame->uc.uc_mcontext);

	err |= save_sigregs_gprs_high(regs, frame->gprs_high);

	err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));

	if (err)

		goto give_sigsegv;

CRA Git | Maintained and supported by SUSTech CRA and CCSE