diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-26 04:04:56 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-26 04:04:56 (GMT) |
commit | 95e14ed7fc4b2db62eb597a70850a0fede48b78a (patch) | |
tree | 63d5dacd5ce094c9c48ce426e38440fba6565e51 /drivers | |
parent | 00a2470546dd8427325636a711a42c934135dbf5 (diff) | |
parent | 0d3db28daed2529ab90933a3aaaaf46446fdfda8 (diff) | |
download | linux-95e14ed7fc4b2db62eb597a70850a0fede48b78a.tar.xz |
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
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/misc/kgdbts.c | 2 | ||||
-rw-r--r-- | drivers/tty/serial/kgdboc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c index 59c118c..27dc463 100644 --- a/drivers/misc/kgdbts.c +++ b/drivers/misc/kgdbts.c @@ -988,7 +988,7 @@ static void kgdbts_run_tests(void) 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"); return -ENOSPC; } diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c index 25a8bc5..87e7e6c 100644 --- a/drivers/tty/serial/kgdboc.c +++ b/drivers/tty/serial/kgdboc.c @@ -131,7 +131,7 @@ static void kgdboc_unregister_kbd(void) 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"); return -ENOSPC; } |