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 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux...
[pandora-kernel.git]
/
lib
/
argv_split.c
diff --git
a/lib/argv_split.c
b/lib/argv_split.c
index
4096ed4
..
5205a8d
100644
(file)
--- a/
lib/argv_split.c
+++ b/
lib/argv_split.c
@@
-4,7
+4,8
@@
#include <linux/kernel.h>
#include <linux/ctype.h>
#include <linux/kernel.h>
#include <linux/ctype.h>
-#include <linux/bug.h>
+#include <linux/slab.h>
+#include <linux/module.h>
static const char *skip_sep(const char *cp)
{
static const char *skip_sep(const char *cp)
{
@@
-75,7
+76,9
@@
char **argv_split(gfp_t gfp, const char *str, int *argcp)
if (argv == NULL)
goto out;
if (argv == NULL)
goto out;
- *argcp = argc;
+ if (argcp)
+ *argcp = argc;
+
argvp = argv;
while (*str) {
argvp = argv;
while (*str) {