Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb: kdb: add usage string of 'per_cpu' command kgdb,x86_64: fix compile warning found with sparse kdb: code cleanup to use macro instead of value kgdboc,kgdbts: strlen() doesn't count the terminator
This commit is contained in:
commit
95e14ed7fc
4 changed files with 6 additions and 6 deletions
|
@ -121,8 +121,8 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
|
||||||
memcpy(mem, (void *)regs + dbg_reg_def[regno].offset,
|
memcpy(mem, (void *)regs + dbg_reg_def[regno].offset,
|
||||||
dbg_reg_def[regno].size);
|
dbg_reg_def[regno].size);
|
||||||
|
|
||||||
switch (regno) {
|
|
||||||
#ifdef CONFIG_X86_32
|
#ifdef CONFIG_X86_32
|
||||||
|
switch (regno) {
|
||||||
case GDB_SS:
|
case GDB_SS:
|
||||||
if (!user_mode_vm(regs))
|
if (!user_mode_vm(regs))
|
||||||
*(unsigned long *)mem = __KERNEL_DS;
|
*(unsigned long *)mem = __KERNEL_DS;
|
||||||
|
@ -135,8 +135,8 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
|
||||||
case GDB_FS:
|
case GDB_FS:
|
||||||
*(unsigned long *)mem = 0xFFFF;
|
*(unsigned long *)mem = 0xFFFF;
|
||||||
break;
|
break;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
return dbg_reg_def[regno].name;
|
return dbg_reg_def[regno].name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -988,7 +988,7 @@ static void kgdbts_run_tests(void)
|
||||||
|
|
||||||
static int kgdbts_option_setup(char *opt)
|
static int kgdbts_option_setup(char *opt)
|
||||||
{
|
{
|
||||||
if (strlen(opt) > MAX_CONFIG_LEN) {
|
if (strlen(opt) >= MAX_CONFIG_LEN) {
|
||||||
printk(KERN_ERR "kgdbts: config string too long\n");
|
printk(KERN_ERR "kgdbts: config string too long\n");
|
||||||
return -ENOSPC;
|
return -ENOSPC;
|
||||||
}
|
}
|
||||||
|
|
|
@ -131,7 +131,7 @@ static void kgdboc_unregister_kbd(void)
|
||||||
|
|
||||||
static int kgdboc_option_setup(char *opt)
|
static int kgdboc_option_setup(char *opt)
|
||||||
{
|
{
|
||||||
if (strlen(opt) > MAX_CONFIG_LEN) {
|
if (strlen(opt) >= MAX_CONFIG_LEN) {
|
||||||
printk(KERN_ERR "kgdboc: config string too long\n");
|
printk(KERN_ERR "kgdboc: config string too long\n");
|
||||||
return -ENOSPC;
|
return -ENOSPC;
|
||||||
}
|
}
|
||||||
|
|
|
@ -78,7 +78,7 @@ static unsigned int kdb_continue_catastrophic;
|
||||||
static kdbtab_t *kdb_commands;
|
static kdbtab_t *kdb_commands;
|
||||||
#define KDB_BASE_CMD_MAX 50
|
#define KDB_BASE_CMD_MAX 50
|
||||||
static int kdb_max_commands = KDB_BASE_CMD_MAX;
|
static int kdb_max_commands = KDB_BASE_CMD_MAX;
|
||||||
static kdbtab_t kdb_base_commands[50];
|
static kdbtab_t kdb_base_commands[KDB_BASE_CMD_MAX];
|
||||||
#define for_each_kdbcmd(cmd, num) \
|
#define for_each_kdbcmd(cmd, num) \
|
||||||
for ((cmd) = kdb_base_commands, (num) = 0; \
|
for ((cmd) = kdb_base_commands, (num) = 0; \
|
||||||
num < kdb_max_commands; \
|
num < kdb_max_commands; \
|
||||||
|
@ -2892,7 +2892,7 @@ static void __init kdb_inittab(void)
|
||||||
"Send a signal to a process", 0, KDB_REPEAT_NONE);
|
"Send a signal to a process", 0, KDB_REPEAT_NONE);
|
||||||
kdb_register_repeat("summary", kdb_summary, "",
|
kdb_register_repeat("summary", kdb_summary, "",
|
||||||
"Summarize the system", 4, KDB_REPEAT_NONE);
|
"Summarize the system", 4, KDB_REPEAT_NONE);
|
||||||
kdb_register_repeat("per_cpu", kdb_per_cpu, "",
|
kdb_register_repeat("per_cpu", kdb_per_cpu, "<sym> [<bytes>] [<cpu>]",
|
||||||
"Display per_cpu variables", 3, KDB_REPEAT_NONE);
|
"Display per_cpu variables", 3, KDB_REPEAT_NONE);
|
||||||
kdb_register_repeat("grephelp", kdb_grep_help, "",
|
kdb_register_repeat("grephelp", kdb_grep_help, "",
|
||||||
"Display help on | grep", 0, KDB_REPEAT_NONE);
|
"Display help on | grep", 0, KDB_REPEAT_NONE);
|
||||||
|
|
Loading…
Reference in a new issue