diff options
Diffstat (limited to 'kernel/trace/trace_probe.c')
| -rw-r--r-- | kernel/trace/trace_probe.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c index daa9980153af..412e959709b4 100644 --- a/kernel/trace/trace_probe.c +++ b/kernel/trace/trace_probe.c | |||
| @@ -441,7 +441,7 @@ static const struct fetch_type *find_fetch_type(const char *type) | |||
| 441 | goto fail; | 441 | goto fail; |
| 442 | 442 | ||
| 443 | type++; | 443 | type++; |
| 444 | if (strict_strtoul(type, 0, &bs)) | 444 | if (kstrtoul(type, 0, &bs)) |
| 445 | goto fail; | 445 | goto fail; |
| 446 | 446 | ||
| 447 | switch (bs) { | 447 | switch (bs) { |
| @@ -501,8 +501,8 @@ int traceprobe_split_symbol_offset(char *symbol, unsigned long *offset) | |||
| 501 | 501 | ||
| 502 | tmp = strchr(symbol, '+'); | 502 | tmp = strchr(symbol, '+'); |
| 503 | if (tmp) { | 503 | if (tmp) { |
| 504 | /* skip sign because strict_strtol doesn't accept '+' */ | 504 | /* skip sign because kstrtoul doesn't accept '+' */ |
| 505 | ret = strict_strtoul(tmp + 1, 0, offset); | 505 | ret = kstrtoul(tmp + 1, 0, offset); |
| 506 | if (ret) | 506 | if (ret) |
| 507 | return ret; | 507 | return ret; |
| 508 | 508 | ||
| @@ -533,7 +533,7 @@ static int parse_probe_vars(char *arg, const struct fetch_type *t, | |||
| 533 | else | 533 | else |
| 534 | ret = -EINVAL; | 534 | ret = -EINVAL; |
| 535 | } else if (isdigit(arg[5])) { | 535 | } else if (isdigit(arg[5])) { |
| 536 | ret = strict_strtoul(arg + 5, 10, ¶m); | 536 | ret = kstrtoul(arg + 5, 10, ¶m); |
| 537 | if (ret || param > PARAM_MAX_STACK) | 537 | if (ret || param > PARAM_MAX_STACK) |
| 538 | ret = -EINVAL; | 538 | ret = -EINVAL; |
| 539 | else { | 539 | else { |
| @@ -579,7 +579,7 @@ static int parse_probe_arg(char *arg, const struct fetch_type *t, | |||
| 579 | 579 | ||
| 580 | case '@': /* memory or symbol */ | 580 | case '@': /* memory or symbol */ |
| 581 | if (isdigit(arg[1])) { | 581 | if (isdigit(arg[1])) { |
| 582 | ret = strict_strtoul(arg + 1, 0, ¶m); | 582 | ret = kstrtoul(arg + 1, 0, ¶m); |
| 583 | if (ret) | 583 | if (ret) |
| 584 | break; | 584 | break; |
| 585 | 585 | ||
| @@ -597,14 +597,14 @@ static int parse_probe_arg(char *arg, const struct fetch_type *t, | |||
| 597 | break; | 597 | break; |
| 598 | 598 | ||
| 599 | case '+': /* deref memory */ | 599 | case '+': /* deref memory */ |
| 600 | arg++; /* Skip '+', because strict_strtol() rejects it. */ | 600 | arg++; /* Skip '+', because kstrtol() rejects it. */ |
| 601 | case '-': | 601 | case '-': |
| 602 | tmp = strchr(arg, '('); | 602 | tmp = strchr(arg, '('); |
| 603 | if (!tmp) | 603 | if (!tmp) |
| 604 | break; | 604 | break; |
| 605 | 605 | ||
| 606 | *tmp = '\0'; | 606 | *tmp = '\0'; |
| 607 | ret = strict_strtol(arg, 0, &offset); | 607 | ret = kstrtol(arg, 0, &offset); |
| 608 | 608 | ||
| 609 | if (ret) | 609 | if (ret) |
| 610 | break; | 610 | break; |
