git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
uaccess.h
diff --git
a/arch/x86/include/asm/uaccess.h
b/arch/x86/include/asm/uaccess.h
index
99ddd14
..
36361bf
100644
(file)
--- a/
arch/x86/include/asm/uaccess.h
+++ b/
arch/x86/include/asm/uaccess.h
@@
-555,6
+555,9
@@
struct __large_struct { unsigned long buf[100]; };
#endif /* CONFIG_X86_WP_WORKS_OK */
#endif /* CONFIG_X86_WP_WORKS_OK */
+extern unsigned long
+copy_from_user_nmi(void *to, const void __user *from, unsigned long n);
+
/*
* movsl can be slow when source and dest are not both 8-byte aligned
*/
/*
* movsl can be slow when source and dest are not both 8-byte aligned
*/