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

Commit 793af244 authored by Al Viro's avatar Al Viro
Browse files

[PATCH] s390 misc __user annotations 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 6b2b4e5a

arch/s390/kernel/sys_s390.c

+2 −2
Original line number Diff line number Diff line
@@ -122,8 +122,8 @@ asmlinkage long old_mmap(struct mmap_arg_struct __user *arg) 
#ifndef CONFIG_64BIT

struct sel_arg_struct {

	unsigned long n;

	fd_set *inp, *outp, *exp;

	struct timeval *tvp;

	fd_set __user *inp, *outp, *exp;

	struct timeval __user *tvp;

};



asmlinkage long old_select(struct sel_arg_struct __user *arg)

arch/s390/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ asmlinkage void illegal_op(struct pt_regs * regs, long interruption_code) 
		info.si_signo = signal;

		info.si_errno = 0;

		info.si_code = ILL_ILLOPC;

		info.si_addr = (void *) location;

		info.si_addr = (void __user *) location;

		do_trap(interruption_code, signal,

			"illegal operation", regs, &info);

	}

include/asm-s390/uaccess.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
#define segment_eq(a,b) ((a).ar4 == (b).ar4)





static inline int __access_ok(const void *addr, unsigned long size)

static inline int __access_ok(const void __user *addr, unsigned long size)

{

	return 1;

}