diff options
| author | David S. Miller <davem@davemloft.net> | 2015-01-15 00:53:17 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-15 00:53:17 -0500 |
| commit | 3f3558bb512e0762d5a4573a4aaf038d7a616e92 (patch) | |
| tree | 1e2b43d410093e949209ca33614f5cdfdd16e80e /kernel/debug/kdb/kdb_private.h | |
| parent | 9a6b4b392de4569e83ecfd6f382f3369f250b52f (diff) | |
| parent | a6391a924cf5a16761ccd6b45094a7d5b9aeebac (diff) | |
| download | talos-op-linux-3f3558bb512e0762d5a4573a4aaf038d7a616e92.tar.gz talos-op-linux-3f3558bb512e0762d5a4573a4aaf038d7a616e92.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/xen-netfront.c
Minor overlapping changes in xen-netfront.c, mostly to do
with some buffer management changes alongside the split
of stats into TX and RX.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/debug/kdb/kdb_private.h')
| -rw-r--r-- | kernel/debug/kdb/kdb_private.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/debug/kdb/kdb_private.h b/kernel/debug/kdb/kdb_private.h index 7afd3c8c41d5..eaacd1693954 100644 --- a/kernel/debug/kdb/kdb_private.h +++ b/kernel/debug/kdb/kdb_private.h @@ -172,10 +172,9 @@ typedef struct _kdbtab { kdb_func_t cmd_func; /* Function to execute command */ char *cmd_usage; /* Usage String for this command */ char *cmd_help; /* Help message for this command */ - short cmd_flags; /* Parsing flags */ short cmd_minlen; /* Minimum legal # command * chars required */ - kdb_repeat_t cmd_repeat; /* Does command auto repeat on enter? */ + kdb_cmdflags_t cmd_flags; /* Command behaviour flags */ } kdbtab_t; extern int kdb_bt(int, const char **); /* KDB display back trace */ |
