diff options
author | Anton Vorontsov <anton.vorontsov@linaro.org> | 2014-11-06 09:36:44 -0500 |
---|---|---|
committer | Jason Wessel <jason.wessel@windriver.com> | 2014-11-11 10:31:52 -0500 |
commit | e8ab24d9b0173ada3eeed31d7d7f982228efc2c5 (patch) | |
tree | 250188c433b4451cc90c905d738c161651e7552d /kernel | |
parent | 04bb171e7aa99dee0c92e772e4f66f8d5c1b4081 (diff) |
kdb: Remove KDB_REPEAT_NONE flag
Since we now treat KDB_REPEAT_* as flags, there is no need to
pass KDB_REPEAT_NONE. It's just the default behaviour when no
flags are specified.
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org>
Cc: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/debug/kdb/kdb_bp.c | 6 | ||||
-rw-r--r-- | kernel/debug/kdb/kdb_main.c | 59 | ||||
-rw-r--r-- | kernel/trace/trace_kdb.c | 2 |
3 files changed, 33 insertions, 34 deletions
diff --git a/kernel/debug/kdb/kdb_bp.c b/kernel/debug/kdb/kdb_bp.c index 59536661c7b9..f8844fb55311 100644 --- a/kernel/debug/kdb/kdb_bp.c +++ b/kernel/debug/kdb/kdb_bp.c | |||
@@ -539,11 +539,11 @@ void __init kdb_initbptab(void) | |||
539 | kdb_register_flags("bph", kdb_bp, "[<vaddr>]", | 539 | kdb_register_flags("bph", kdb_bp, "[<vaddr>]", |
540 | "[datar [length]|dataw [length]] Set hw brk", 0, KDB_REPEAT_NO_ARGS); | 540 | "[datar [length]|dataw [length]] Set hw brk", 0, KDB_REPEAT_NO_ARGS); |
541 | kdb_register_flags("bc", kdb_bc, "<bpnum>", | 541 | kdb_register_flags("bc", kdb_bc, "<bpnum>", |
542 | "Clear Breakpoint", 0, KDB_REPEAT_NONE); | 542 | "Clear Breakpoint", 0, 0); |
543 | kdb_register_flags("be", kdb_bc, "<bpnum>", | 543 | kdb_register_flags("be", kdb_bc, "<bpnum>", |
544 | "Enable Breakpoint", 0, KDB_REPEAT_NONE); | 544 | "Enable Breakpoint", 0, 0); |
545 | kdb_register_flags("bd", kdb_bc, "<bpnum>", | 545 | kdb_register_flags("bd", kdb_bc, "<bpnum>", |
546 | "Disable Breakpoint", 0, KDB_REPEAT_NONE); | 546 | "Disable Breakpoint", 0, 0); |
547 | 547 | ||
548 | kdb_register_flags("ss", kdb_ss, "", | 548 | kdb_register_flags("ss", kdb_ss, "", |
549 | "Single Step", 1, KDB_REPEAT_NO_ARGS); | 549 | "Single Step", 1, KDB_REPEAT_NO_ARGS); |
diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c index cbacae24a55a..538bf1dce26a 100644 --- a/kernel/debug/kdb/kdb_main.c +++ b/kernel/debug/kdb/kdb_main.c | |||
@@ -2698,7 +2698,7 @@ EXPORT_SYMBOL_GPL(kdb_register_flags); | |||
2698 | /* | 2698 | /* |
2699 | * kdb_register - Compatibility register function for commands that do | 2699 | * kdb_register - Compatibility register function for commands that do |
2700 | * not need to specify a repeat state. Equivalent to | 2700 | * not need to specify a repeat state. Equivalent to |
2701 | * kdb_register_flags with KDB_REPEAT_NONE. | 2701 | * kdb_register_flags with flags set to 0. |
2702 | * Inputs: | 2702 | * Inputs: |
2703 | * cmd Command name | 2703 | * cmd Command name |
2704 | * func Function to execute the command | 2704 | * func Function to execute the command |
@@ -2713,8 +2713,7 @@ int kdb_register(char *cmd, | |||
2713 | char *help, | 2713 | char *help, |
2714 | short minlen) | 2714 | short minlen) |
2715 | { | 2715 | { |
2716 | return kdb_register_flags(cmd, func, usage, help, minlen, | 2716 | return kdb_register_flags(cmd, func, usage, help, minlen, 0); |
2717 | KDB_REPEAT_NONE); | ||
2718 | } | 2717 | } |
2719 | EXPORT_SYMBOL_GPL(kdb_register); | 2718 | EXPORT_SYMBOL_GPL(kdb_register); |
2720 | 2719 | ||
@@ -2768,68 +2767,68 @@ static void __init kdb_inittab(void) | |||
2768 | kdb_register_flags("mm", kdb_mm, "<vaddr> <contents>", | 2767 | kdb_register_flags("mm", kdb_mm, "<vaddr> <contents>", |
2769 | "Modify Memory Contents", 0, KDB_REPEAT_NO_ARGS); | 2768 | "Modify Memory Contents", 0, KDB_REPEAT_NO_ARGS); |
2770 | kdb_register_flags("go", kdb_go, "[<vaddr>]", | 2769 | kdb_register_flags("go", kdb_go, "[<vaddr>]", |
2771 | "Continue Execution", 1, KDB_REPEAT_NONE); | 2770 | "Continue Execution", 1, 0); |
2772 | kdb_register_flags("rd", kdb_rd, "", | 2771 | kdb_register_flags("rd", kdb_rd, "", |
2773 | "Display Registers", 0, KDB_REPEAT_NONE); | 2772 | "Display Registers", 0, 0); |
2774 | kdb_register_flags("rm", kdb_rm, "<reg> <contents>", | 2773 | kdb_register_flags("rm", kdb_rm, "<reg> <contents>", |
2775 | "Modify Registers", 0, KDB_REPEAT_NONE); | 2774 | "Modify Registers", 0, 0); |
2776 | kdb_register_flags("ef", kdb_ef, "<vaddr>", | 2775 | kdb_register_flags("ef", kdb_ef, "<vaddr>", |
2777 | "Display exception frame", 0, KDB_REPEAT_NONE); | 2776 | "Display exception frame", 0, 0); |
2778 | kdb_register_flags("bt", kdb_bt, "[<vaddr>]", | 2777 | kdb_register_flags("bt", kdb_bt, "[<vaddr>]", |
2779 | "Stack traceback", 1, KDB_REPEAT_NONE); | 2778 | "Stack traceback", 1, 0); |
2780 | kdb_register_flags("btp", kdb_bt, "<pid>", | 2779 | kdb_register_flags("btp", kdb_bt, "<pid>", |
2781 | "Display stack for process <pid>", 0, KDB_REPEAT_NONE); | 2780 | "Display stack for process <pid>", 0, 0); |
2782 | kdb_register_flags("bta", kdb_bt, "[D|R|S|T|C|Z|E|U|I|M|A]", | 2781 | kdb_register_flags("bta", kdb_bt, "[D|R|S|T|C|Z|E|U|I|M|A]", |
2783 | "Backtrace all processes matching state flag", 0, KDB_REPEAT_NONE); | 2782 | "Backtrace all processes matching state flag", 0, 0); |
2784 | kdb_register_flags("btc", kdb_bt, "", | 2783 | kdb_register_flags("btc", kdb_bt, "", |
2785 | "Backtrace current process on each cpu", 0, KDB_REPEAT_NONE); | 2784 | "Backtrace current process on each cpu", 0, 0); |
2786 | kdb_register_flags("btt", kdb_bt, "<vaddr>", | 2785 | kdb_register_flags("btt", kdb_bt, "<vaddr>", |
2787 | "Backtrace process given its struct task address", 0, | 2786 | "Backtrace process given its struct task address", 0, |
2788 | KDB_REPEAT_NONE); | 2787 | 0); |
2789 | kdb_register_flags("env", kdb_env, "", | 2788 | kdb_register_flags("env", kdb_env, "", |
2790 | "Show environment variables", 0, KDB_REPEAT_NONE); | 2789 | "Show environment variables", 0, 0); |
2791 | kdb_register_flags("set", kdb_set, "", | 2790 | kdb_register_flags("set", kdb_set, "", |
2792 | "Set environment variables", 0, KDB_REPEAT_NONE); | 2791 | "Set environment variables", 0, 0); |
2793 | kdb_register_flags("help", kdb_help, "", | 2792 | kdb_register_flags("help", kdb_help, "", |
2794 | "Display Help Message", 1, KDB_REPEAT_NONE); | 2793 | "Display Help Message", 1, 0); |
2795 | kdb_register_flags("?", kdb_help, "", | 2794 | kdb_register_flags("?", kdb_help, "", |
2796 | "Display Help Message", 0, KDB_REPEAT_NONE); | 2795 | "Display Help Message", 0, 0); |
2797 | kdb_register_flags("cpu", kdb_cpu, "<cpunum>", | 2796 | kdb_register_flags("cpu", kdb_cpu, "<cpunum>", |
2798 | "Switch to new cpu", 0, KDB_REPEAT_NONE); | 2797 | "Switch to new cpu", 0, 0); |
2799 | kdb_register_flags("kgdb", kdb_kgdb, "", | 2798 | kdb_register_flags("kgdb", kdb_kgdb, "", |
2800 | "Enter kgdb mode", 0, KDB_REPEAT_NONE); | 2799 | "Enter kgdb mode", 0, 0); |
2801 | kdb_register_flags("ps", kdb_ps, "[<flags>|A]", | 2800 | kdb_register_flags("ps", kdb_ps, "[<flags>|A]", |
2802 | "Display active task list", 0, KDB_REPEAT_NONE); | 2801 | "Display active task list", 0, 0); |
2803 | kdb_register_flags("pid", kdb_pid, "<pidnum>", | 2802 | kdb_register_flags("pid", kdb_pid, "<pidnum>", |
2804 | "Switch to another task", 0, KDB_REPEAT_NONE); | 2803 | "Switch to another task", 0, 0); |
2805 | kdb_register_flags("reboot", kdb_reboot, "", | 2804 | kdb_register_flags("reboot", kdb_reboot, "", |
2806 | "Reboot the machine immediately", 0, KDB_REPEAT_NONE); | 2805 | "Reboot the machine immediately", 0, 0); |
2807 | #if defined(CONFIG_MODULES) | 2806 | #if defined(CONFIG_MODULES) |
2808 | kdb_register_flags("lsmod", kdb_lsmod, "", | 2807 | kdb_register_flags("lsmod", kdb_lsmod, "", |
2809 | "List loaded kernel modules", 0, KDB_REPEAT_NONE); | 2808 | "List loaded kernel modules", 0, 0); |
2810 | #endif | 2809 | #endif |
2811 | #if defined(CONFIG_MAGIC_SYSRQ) | 2810 | #if defined(CONFIG_MAGIC_SYSRQ) |
2812 | kdb_register_flags("sr", kdb_sr, "<key>", | 2811 | kdb_register_flags("sr", kdb_sr, "<key>", |
2813 | "Magic SysRq key", 0, KDB_REPEAT_NONE); | 2812 | "Magic SysRq key", 0, 0); |
2814 | #endif | 2813 | #endif |
2815 | #if defined(CONFIG_PRINTK) | 2814 | #if defined(CONFIG_PRINTK) |
2816 | kdb_register_flags("dmesg", kdb_dmesg, "[lines]", | 2815 | kdb_register_flags("dmesg", kdb_dmesg, "[lines]", |
2817 | "Display syslog buffer", 0, KDB_REPEAT_NONE); | 2816 | "Display syslog buffer", 0, 0); |
2818 | #endif | 2817 | #endif |
2819 | if (arch_kgdb_ops.enable_nmi) { | 2818 | if (arch_kgdb_ops.enable_nmi) { |
2820 | kdb_register_flags("disable_nmi", kdb_disable_nmi, "", | 2819 | kdb_register_flags("disable_nmi", kdb_disable_nmi, "", |
2821 | "Disable NMI entry to KDB", 0, KDB_REPEAT_NONE); | 2820 | "Disable NMI entry to KDB", 0, 0); |
2822 | } | 2821 | } |
2823 | kdb_register_flags("defcmd", kdb_defcmd, "name \"usage\" \"help\"", | 2822 | kdb_register_flags("defcmd", kdb_defcmd, "name \"usage\" \"help\"", |
2824 | "Define a set of commands, down to endefcmd", 0, KDB_REPEAT_NONE); | 2823 | "Define a set of commands, down to endefcmd", 0, 0); |
2825 | kdb_register_flags("kill", kdb_kill, "<-signal> <pid>", | 2824 | kdb_register_flags("kill", kdb_kill, "<-signal> <pid>", |
2826 | "Send a signal to a process", 0, KDB_REPEAT_NONE); | 2825 | "Send a signal to a process", 0, 0); |
2827 | kdb_register_flags("summary", kdb_summary, "", | 2826 | kdb_register_flags("summary", kdb_summary, "", |
2828 | "Summarize the system", 4, KDB_REPEAT_NONE); | 2827 | "Summarize the system", 4, 0); |
2829 | kdb_register_flags("per_cpu", kdb_per_cpu, "<sym> [<bytes>] [<cpu>]", | 2828 | kdb_register_flags("per_cpu", kdb_per_cpu, "<sym> [<bytes>] [<cpu>]", |
2830 | "Display per_cpu variables", 3, KDB_REPEAT_NONE); | 2829 | "Display per_cpu variables", 3, 0); |
2831 | kdb_register_flags("grephelp", kdb_grep_help, "", | 2830 | kdb_register_flags("grephelp", kdb_grep_help, "", |
2832 | "Display help on | grep", 0, KDB_REPEAT_NONE); | 2831 | "Display help on | grep", 0, 0); |
2833 | } | 2832 | } |
2834 | 2833 | ||
2835 | /* Execute any commands defined in kdb_cmds. */ | 2834 | /* Execute any commands defined in kdb_cmds. */ |
diff --git a/kernel/trace/trace_kdb.c b/kernel/trace/trace_kdb.c index 1e3b36c75048..3da7e3043596 100644 --- a/kernel/trace/trace_kdb.c +++ b/kernel/trace/trace_kdb.c | |||
@@ -128,7 +128,7 @@ static int kdb_ftdump(int argc, const char **argv) | |||
128 | static __init int kdb_ftrace_register(void) | 128 | static __init int kdb_ftrace_register(void) |
129 | { | 129 | { |
130 | kdb_register_flags("ftdump", kdb_ftdump, "[skip_#lines] [cpu]", | 130 | kdb_register_flags("ftdump", kdb_ftdump, "[skip_#lines] [cpu]", |
131 | "Dump ftrace log", 0, KDB_REPEAT_NONE); | 131 | "Dump ftrace log", 0, 0); |
132 | return 0; | 132 | return 0; |
133 | } | 133 | } |
134 | 134 | ||