aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-26 00:04:56 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-26 00:04:56 -0400
commit95e14ed7fc4b2db62eb597a70850a0fede48b78a (patch)
tree63d5dacd5ce094c9c48ce426e38440fba6565e51 /drivers
parent00a2470546dd8427325636a711a42c934135dbf5 (diff)
parent0d3db28daed2529ab90933a3aaaaf46446fdfda8 (diff)
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.c2
-rw-r--r--drivers/tty/serial/kgdboc.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
index 59c118c19a91..27dc463097f3 100644
--- a/drivers/misc/kgdbts.c
+++ b/drivers/misc/kgdbts.c
@@ -988,7 +988,7 @@ static void kgdbts_run_tests(void)
988 988
989static int kgdbts_option_setup(char *opt) 989static int kgdbts_option_setup(char *opt)
990{ 990{
991 if (strlen(opt) > MAX_CONFIG_LEN) { 991 if (strlen(opt) >= MAX_CONFIG_LEN) {
992 printk(KERN_ERR "kgdbts: config string too long\n"); 992 printk(KERN_ERR "kgdbts: config string too long\n");
993 return -ENOSPC; 993 return -ENOSPC;
994 } 994 }
diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
index 25a8bc565f40..87e7e6c876d4 100644
--- a/drivers/tty/serial/kgdboc.c
+++ b/drivers/tty/serial/kgdboc.c
@@ -131,7 +131,7 @@ static void kgdboc_unregister_kbd(void)
131 131
132static int kgdboc_option_setup(char *opt) 132static int kgdboc_option_setup(char *opt)
133{ 133{
134 if (strlen(opt) > MAX_CONFIG_LEN) { 134 if (strlen(opt) >= MAX_CONFIG_LEN) {
135 printk(KERN_ERR "kgdboc: config string too long\n"); 135 printk(KERN_ERR "kgdboc: config string too long\n");
136 return -ENOSPC; 136 return -ENOSPC;
137 } 137 }