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

Commit ed4fc720 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 

* 'futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  futex: request only one page from get_user_pages()
parents f4fa4468 aa715284

kernel/futex.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -299,7 +299,7 @@ void put_futex_key(int fshared, union futex_key *key) 
static int fault_in_user_writeable(u32 __user *uaddr)

static int fault_in_user_writeable(u32 __user *uaddr)

{

{

	int ret = get_user_pages(current, current->mm, (unsigned long)uaddr,

	int ret = get_user_pages(current, current->mm, (unsigned long)uaddr,

				 sizeof(*uaddr), 1, 0, NULL, NULL);

				 1, 1, 0, NULL, NULL);

	return ret < 0 ? ret : 0;

	return ret < 0 ? ret : 0;

}

}