Commit 2be1f3a7 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] partitions: fix build error in ibm partition detection code
  [S390] appldata: fix dev_get_stats 64 bit conversion
  [S390] wire up prlimit64 and fanotify* syscalls
  [S390] zcrypt: fix Kconfig dependencies
  [S390] sys_personality: follow u_long to unsigned int conversion
  [S390] dasd: fix format string types
parents 1547ac89 2041f657

arch/s390/appldata/appldata_net_sum.c

+2 −1
Original line number Diff line number Diff line
@@ -85,9 +85,10 @@ static void appldata_get_net_sum_data(void *data) 


	rcu_read_lock();

	for_each_netdev_rcu(&init_net, dev) {

		const struct rtnl_link_stats64 *stats;

		struct rtnl_link_stats64 temp;

		const struct net_device_stats *stats = dev_get_stats(dev, &temp);



		stats = dev_get_stats(dev, &temp);

		rx_packets += stats->rx_packets;

		tx_packets += stats->tx_packets;

		rx_bytes   += stats->rx_bytes;

arch/s390/include/asm/unistd.h

+4 −1
Original line number Diff line number Diff line
@@ -269,7 +269,10 @@ 
#define	__NR_pwritev		329

#define __NR_rt_tgsigqueueinfo	330

#define __NR_perf_event_open	331

#define NR_syscalls 332

#define __NR_fanotify_init	332

#define __NR_fanotify_mark	333

#define __NR_prlimit64		334

#define NR_syscalls 335



/* 

 * There are some system calls that are not present on 64 bit, some

arch/s390/kernel/compat_wrapper.S

+25 −1
Original line number Diff line number Diff line
@@ -614,7 +614,7 @@ sys32_sysfs_wrapper: 


	.globl	sys32_personality_wrapper

sys32_personality_wrapper:

	llgfr	%r2,%r2			# unsigned long

	llgfr	%r2,%r2			# unsigned int

	jg	sys_s390_personality	# branch to system call



	.globl	sys32_setfsuid16_wrapper
@@ -1853,3 +1853,27 @@ sys32_execve_wrapper: 
	llgtr	%r3,%r3			# compat_uptr_t *

	llgtr	%r4,%r4			# compat_uptr_t *

	jg	sys32_execve		# branch to system call



	.globl	sys_fanotify_init_wrapper

sys_fanotify_init_wrapper:

	llgfr	%r2,%r2			# unsigned int

	llgfr	%r3,%r3			# unsigned int

	jg	sys_fanotify_init	# branch to system call



	.globl	sys_fanotify_mark_wrapper

sys_fanotify_mark_wrapper:

	lgfr	%r2,%r2			# int

	llgfr	%r3,%r3			# unsigned int

	sllg	%r4,%r4,32		# get high word of 64bit mask

	lr	%r4,%r5			# get low word of 64bit mask

	llgfr	%r5,%r6			# unsigned int

	llgt	%r6,164(%r15)		# char *

	jg	sys_fanotify_mark	# branch to system call



	.globl	sys_prlimit64_wrapper

sys_prlimit64_wrapper:

	lgfr	%r2,%r2			# pid_t

	llgfr	%r3,%r3			# unsigned int

	llgtr	%r4,%r4			# const struct rlimit64 __user *

	llgtr	%r5,%r5			# struct rlimit64 __user *

	jg	sys_prlimit64		# branch to system call

arch/s390/kernel/entry.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct old_sigaction; 
long sys_mmap2(struct s390_mmap_arg_struct __user  *arg);

long sys_s390_ipc(uint call, int first, unsigned long second,

	     unsigned long third, void __user *ptr);

long sys_s390_personality(unsigned long personality);

long sys_s390_personality(unsigned int personality);

long sys_s390_fadvise64(int fd, u32 offset_high, u32 offset_low,

		    size_t len, int advice);

long sys_s390_fadvise64_64(struct fadvise64_64_args __user *args);

arch/s390/kernel/sys_s390.c

+2 −2
Original line number Diff line number Diff line
@@ -131,9 +131,9 @@ SYSCALL_DEFINE5(s390_ipc, uint, call, int, first, unsigned long, second, 
}



#ifdef CONFIG_64BIT

SYSCALL_DEFINE1(s390_personality, unsigned long, personality)

SYSCALL_DEFINE1(s390_personality, unsigned int, personality)

{

	int ret;

	unsigned int ret;



	if (current->personality == PER_LINUX32 && personality == PER_LINUX)

		personality = PER_LINUX32;

CRA Git | Maintained and supported by SUSTech CRA and CCSE