projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into upstream
[powerpc.git]
/
mm
/
util.c
diff --git
a/mm/util.c
b/mm/util.c
index
49e29f7
..
7368479
100644
(file)
--- a/
mm/util.c
+++ b/
mm/util.c
@@
-5,18
+5,18
@@
#include <asm/uaccess.h>
/**
#include <asm/uaccess.h>
/**
- * kzalloc - allocate memory. The memory is set to zero.
+ *
__
kzalloc - allocate memory. The memory is set to zero.
* @size: how many bytes of memory are required.
* @flags: the type of memory to allocate.
*/
* @size: how many bytes of memory are required.
* @flags: the type of memory to allocate.
*/
-void *kzalloc(size_t size, gfp_t flags)
+void *
__
kzalloc(size_t size, gfp_t flags)
{
{
- void *ret = kmalloc(size, flags);
+ void *ret =
____
kmalloc(size, flags);
if (ret)
memset(ret, 0, size);
return ret;
}
if (ret)
memset(ret, 0, size);
return ret;
}
-EXPORT_SYMBOL(kzalloc);
+EXPORT_SYMBOL(
__
kzalloc);
/*
* kstrdup - allocate space for and copy an existing string
/*
* kstrdup - allocate space for and copy an existing string
@@
-33,7
+33,7
@@
char *kstrdup(const char *s, gfp_t gfp)
return NULL;
len = strlen(s) + 1;
return NULL;
len = strlen(s) + 1;
- buf = kmalloc(len, gfp);
+ buf =
____
kmalloc(len, gfp);
if (buf)
memcpy(buf, s, len);
return buf;
if (buf)
memcpy(buf, s, len);
return buf;