projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
[powerpc.git]
/
include
/
asm-cris
/
arch-v32
/
uaccess.h
diff --git
a/include/asm-cris/arch-v32/uaccess.h
b/include/asm-cris/arch-v32/uaccess.h
index
055a0bd
..
6b207f1
100644
(file)
--- a/
include/asm-cris/arch-v32/uaccess.h
+++ b/
include/asm-cris/arch-v32/uaccess.h
@@
-93,7
+93,7
@@
* bytes copied if we hit a null byte
* (without the null byte)
*/
* bytes copied if we hit a null byte
* (without the null byte)
*/
-
extern
inline long
+
static
inline long
__do_strncpy_from_user(char *dst, const char *src, long count)
{
long res;
__do_strncpy_from_user(char *dst, const char *src, long count)
{
long res;
@@
-695,7
+695,7
@@
__do_strncpy_from_user(char *dst, const char *src, long count)
* or 0 for error. Return a value greater than N if too long.
*/
* or 0 for error. Return a value greater than N if too long.
*/
-
extern
inline long
+
static
inline long
strnlen_user(const char *s, long n)
{
long res, tmp1;
strnlen_user(const char *s, long n)
{
long res, tmp1;