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

Commit b4a08a10 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

misc uml annotation and section fixes 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 27bb628a

arch/um/kernel/mem.c

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static void __init kmap_init(void) 
	kmap_prot = PAGE_KERNEL;

}



static void init_highmem(void)

static void __init init_highmem(void)

{

	pgd_t *pgd;

	pud_t *pud;

arch/um/sys-i386/ptrace.c

+4 −4
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ int get_fpregs(struct user_i387_struct __user *buf, struct task_struct *child) 
	if (err)

		return err;



	n = copy_to_user((void *) buf, fpregs, sizeof(fpregs));

	n = copy_to_user(buf, fpregs, sizeof(fpregs));

	if(n > 0)

		return -EFAULT;
@@ -168,7 +168,7 @@ int set_fpregs(struct user_i387_struct __user *buf, struct task_struct *child) 
	long fpregs[HOST_FP_SIZE];



	BUG_ON(sizeof(*buf) != sizeof(fpregs));

	n = copy_from_user(fpregs, (void *) buf, sizeof(fpregs));

	n = copy_from_user(fpregs, buf, sizeof(fpregs));

	if (n > 0)

		return -EFAULT;
@@ -185,7 +185,7 @@ int get_fpxregs(struct user_fxsr_struct __user *buf, struct task_struct *child) 
	if (err)

		return err;



	n = copy_to_user((void *) buf, fpregs, sizeof(fpregs));

	n = copy_to_user(buf, fpregs, sizeof(fpregs));

	if(n > 0)

		return -EFAULT;
@@ -198,7 +198,7 @@ int set_fpxregs(struct user_fxsr_struct __user *buf, struct task_struct *child) 
	long fpregs[HOST_XFP_SIZE];



	BUG_ON(sizeof(*buf) != sizeof(fpregs));

	n = copy_from_user(fpregs, (void *) buf, sizeof(fpregs));

	n = copy_from_user(fpregs, buf, sizeof(fpregs));

	if (n > 0)

		return -EFAULT;

arch/um/sys-x86_64/ptrace.c

+2 −2
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ int get_fpregs(struct user_i387_struct __user *buf, struct task_struct *child) 
	if (err)

		return err;



	n = copy_to_user((void *) buf, fpregs, sizeof(fpregs));

	n = copy_to_user(buf, fpregs, sizeof(fpregs));

	if(n > 0)

		return -EFAULT;
@@ -167,7 +167,7 @@ int set_fpregs(struct user_i387_struct __user *buf, struct task_struct *child) 
	long fpregs[HOST_FP_SIZE];



	BUG_ON(sizeof(*buf) != sizeof(fpregs));

	n = copy_from_user(fpregs, (void *) buf, sizeof(fpregs));

	n = copy_from_user(fpregs, buf, sizeof(fpregs));

	if (n > 0)

		return -EFAULT;