OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'dmaengine-4.2-rc1' of git://git.infradead.org/users/vkoul/slave-dma
[uclinux-h8/linux.git]
/
kernel
/
params.c
diff --git
a/kernel/params.c
b/kernel/params.c
index
a22d6a7
..
30288c1
100644
(file)
--- a/
kernel/params.c
+++ b/
kernel/params.c
@@
-100,8
+100,9
@@
static int parse_one(char *param,
unsigned num_params,
s16 min_level,
s16 max_level,
unsigned num_params,
s16 min_level,
s16 max_level,
+ void *arg,
int (*handle_unknown)(char *param, char *val,
int (*handle_unknown)(char *param, char *val,
- const char *doing))
+ const char *doing
, void *arg
))
{
unsigned int i;
int err;
{
unsigned int i;
int err;
@@
-128,7
+129,7
@@
static int parse_one(char *param,
if (handle_unknown) {
pr_debug("doing %s: %s='%s'\n", doing, param, val);
if (handle_unknown) {
pr_debug("doing %s: %s='%s'\n", doing, param, val);
- return handle_unknown(param, val, doing);
+ return handle_unknown(param, val, doing
, arg
);
}
pr_debug("Unknown argument '%s'\n", param);
}
pr_debug("Unknown argument '%s'\n", param);
@@
-194,7
+195,9
@@
char *parse_args(const char *doing,
unsigned num,
s16 min_level,
s16 max_level,
unsigned num,
s16 min_level,
s16 max_level,
- int (*unknown)(char *param, char *val, const char *doing))
+ void *arg,
+ int (*unknown)(char *param, char *val,
+ const char *doing, void *arg))
{
char *param, *val;
{
char *param, *val;
@@
-214,7
+217,7
@@
char *parse_args(const char *doing,
return args;
irq_was_disabled = irqs_disabled();
ret = parse_one(param, val, doing, params, num,
return args;
irq_was_disabled = irqs_disabled();
ret = parse_one(param, val, doing, params, num,
- min_level, max_level, unknown);
+ min_level, max_level,
arg,
unknown);
if (irq_was_disabled && !irqs_disabled())
pr_warn("%s: option '%s' enabled irq's!\n",
doing, param);
if (irq_was_disabled && !irqs_disabled())
pr_warn("%s: option '%s' enabled irq's!\n",
doing, param);