diff options
-rw-r--r-- | include/linux/kdb.h | 6 | ||||
-rw-r--r-- | kernel/debug/kdb/kdb_main.c | 6 | ||||
-rw-r--r-- | kernel/debug/kdb/kdb_private.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/kdb.h b/include/linux/kdb.h index 290db1269c4c..e650f79aa414 100644 --- a/include/linux/kdb.h +++ b/include/linux/kdb.h | |||
@@ -17,7 +17,7 @@ typedef enum { | |||
17 | KDB_REPEAT_NONE = 0, /* Do not repeat this command */ | 17 | KDB_REPEAT_NONE = 0, /* Do not repeat this command */ |
18 | KDB_REPEAT_NO_ARGS, /* Repeat the command without arguments */ | 18 | KDB_REPEAT_NO_ARGS, /* Repeat the command without arguments */ |
19 | KDB_REPEAT_WITH_ARGS, /* Repeat the command including its arguments */ | 19 | KDB_REPEAT_WITH_ARGS, /* Repeat the command including its arguments */ |
20 | } kdb_repeat_t; | 20 | } kdb_cmdflags_t; |
21 | 21 | ||
22 | typedef int (*kdb_func_t)(int, const char **); | 22 | typedef int (*kdb_func_t)(int, const char **); |
23 | 23 | ||
@@ -147,7 +147,7 @@ static inline const char *kdb_walk_kallsyms(loff_t *pos) | |||
147 | /* Dynamic kdb shell command registration */ | 147 | /* Dynamic kdb shell command registration */ |
148 | extern int kdb_register(char *, kdb_func_t, char *, char *, short); | 148 | extern int kdb_register(char *, kdb_func_t, char *, char *, short); |
149 | extern int kdb_register_repeat(char *, kdb_func_t, char *, char *, | 149 | extern int kdb_register_repeat(char *, kdb_func_t, char *, char *, |
150 | short, kdb_repeat_t); | 150 | short, kdb_cmdflags_t); |
151 | extern int kdb_unregister(char *); | 151 | extern int kdb_unregister(char *); |
152 | #else /* ! CONFIG_KGDB_KDB */ | 152 | #else /* ! CONFIG_KGDB_KDB */ |
153 | static inline __printf(1, 2) int kdb_printf(const char *fmt, ...) { return 0; } | 153 | static inline __printf(1, 2) int kdb_printf(const char *fmt, ...) { return 0; } |
@@ -156,7 +156,7 @@ static inline int kdb_register(char *cmd, kdb_func_t func, char *usage, | |||
156 | char *help, short minlen) { return 0; } | 156 | char *help, short minlen) { return 0; } |
157 | static inline int kdb_register_repeat(char *cmd, kdb_func_t func, char *usage, | 157 | static inline int kdb_register_repeat(char *cmd, kdb_func_t func, char *usage, |
158 | char *help, short minlen, | 158 | char *help, short minlen, |
159 | kdb_repeat_t repeat) { return 0; } | 159 | kdb_cmdflags_t flags) { return 0; } |
160 | static inline int kdb_unregister(char *cmd) { return 0; } | 160 | static inline int kdb_unregister(char *cmd) { return 0; } |
161 | #endif /* CONFIG_KGDB_KDB */ | 161 | #endif /* CONFIG_KGDB_KDB */ |
162 | enum { | 162 | enum { |
diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c index cc02aa205668..41966b5f86b7 100644 --- a/kernel/debug/kdb/kdb_main.c +++ b/kernel/debug/kdb/kdb_main.c | |||
@@ -1008,7 +1008,7 @@ int kdb_parse(const char *cmdstr) | |||
1008 | if (result && ignore_errors && result > KDB_CMD_GO) | 1008 | if (result && ignore_errors && result > KDB_CMD_GO) |
1009 | result = 0; | 1009 | result = 0; |
1010 | KDB_STATE_CLEAR(CMD); | 1010 | KDB_STATE_CLEAR(CMD); |
1011 | switch (tp->cmd_repeat) { | 1011 | switch (tp->cmd_flags) { |
1012 | case KDB_REPEAT_NONE: | 1012 | case KDB_REPEAT_NONE: |
1013 | argc = 0; | 1013 | argc = 0; |
1014 | if (argv[0]) | 1014 | if (argv[0]) |
@@ -2646,7 +2646,7 @@ int kdb_register_repeat(char *cmd, | |||
2646 | char *usage, | 2646 | char *usage, |
2647 | char *help, | 2647 | char *help, |
2648 | short minlen, | 2648 | short minlen, |
2649 | kdb_repeat_t repeat) | 2649 | kdb_cmdflags_t flags) |
2650 | { | 2650 | { |
2651 | int i; | 2651 | int i; |
2652 | kdbtab_t *kp; | 2652 | kdbtab_t *kp; |
@@ -2695,7 +2695,7 @@ int kdb_register_repeat(char *cmd, | |||
2695 | kp->cmd_usage = usage; | 2695 | kp->cmd_usage = usage; |
2696 | kp->cmd_help = help; | 2696 | kp->cmd_help = help; |
2697 | kp->cmd_minlen = minlen; | 2697 | kp->cmd_minlen = minlen; |
2698 | kp->cmd_repeat = repeat; | 2698 | kp->cmd_flags = flags; |
2699 | 2699 | ||
2700 | return 0; | 2700 | return 0; |
2701 | } | 2701 | } |
diff --git a/kernel/debug/kdb/kdb_private.h b/kernel/debug/kdb/kdb_private.h index c4c46c7b26fd..eaacd1693954 100644 --- a/kernel/debug/kdb/kdb_private.h +++ b/kernel/debug/kdb/kdb_private.h | |||
@@ -174,7 +174,7 @@ typedef struct _kdbtab { | |||
174 | char *cmd_help; /* Help message for this command */ | 174 | char *cmd_help; /* Help message for this command */ |
175 | short cmd_minlen; /* Minimum legal # command | 175 | short cmd_minlen; /* Minimum legal # command |
176 | * chars required */ | 176 | * chars required */ |
177 | kdb_repeat_t cmd_repeat; /* Does command auto repeat on enter? */ | 177 | kdb_cmdflags_t cmd_flags; /* Command behaviour flags */ |
178 | } kdbtab_t; | 178 | } kdbtab_t; |
179 | 179 | ||
180 | extern int kdb_bt(int, const char **); /* KDB display back trace */ | 180 | extern int kdb_bt(int, const char **); /* KDB display back trace */ |