git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
smp_call_function_any(): pass the node value to cpumask_of_node()
[safe/jmp/linux-2.6]
/
kernel
/
params.c
diff --git
a/kernel/params.c
b/kernel/params.c
index
00520c4
..
cf1b691
100644
(file)
--- a/
kernel/params.c
+++ b/
kernel/params.c
@@
-24,6
+24,7
@@
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/ctype.h>
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/ctype.h>
+#include <linux/string.h>
#if 0
#define DEBUGP printk
#if 0
#define DEBUGP printk
@@
-122,9
+123,7
@@
static char *next_arg(char *args, char **param, char **val)
next = args + i;
/* Chew up trailing spaces. */
next = args + i;
/* Chew up trailing spaces. */
- while (isspace(*next))
- next++;
- return next;
+ return skip_spaces(next);
}
/* Args looks like "foo=bar,bar2 baz=fuz wiz". */
}
/* Args looks like "foo=bar,bar2 baz=fuz wiz". */
@@
-139,8
+138,7
@@
int parse_args(const char *name,
DEBUGP("Parsing ARGS: %s\n", args);
/* Chew leading spaces */
DEBUGP("Parsing ARGS: %s\n", args);
/* Chew leading spaces */
- while (isspace(*args))
- args++;
+ args = skip_spaces(args);
while (*args) {
int ret;
while (*args) {
int ret;
@@
-300,6
+298,7
@@
static int param_array(const char *name,
unsigned int min, unsigned int max,
void *elem, int elemsize,
int (*set)(const char *, struct kernel_param *kp),
unsigned int min, unsigned int max,
void *elem, int elemsize,
int (*set)(const char *, struct kernel_param *kp),
+ u16 flags,
unsigned int *num)
{
int ret;
unsigned int *num)
{
int ret;
@@
-309,6
+308,7
@@
static int param_array(const char *name,
/* Get the name right for errors. */
kp.name = name;
kp.arg = elem;
/* Get the name right for errors. */
kp.name = name;
kp.arg = elem;
+ kp.flags = flags;
/* No equals sign? */
if (!val) {
/* No equals sign? */
if (!val) {
@@
-354,7
+354,8
@@
int param_array_set(const char *val, struct kernel_param *kp)
unsigned int temp_num;
return param_array(kp->name, val, 1, arr->max, arr->elem,
unsigned int temp_num;
return param_array(kp->name, val, 1, arr->max, arr->elem,
- arr->elemsize, arr->set, arr->num ?: &temp_num);
+ arr->elemsize, arr->set, kp->flags,
+ arr->num ?: &temp_num);
}
int param_array_get(char *buffer, struct kernel_param *kp)
}
int param_array_get(char *buffer, struct kernel_param *kp)