| From 2dd453168643d9475028cd867c57e65956a0f7f9 Mon Sep 17 00:00:00 2001 |
| From: Laura Abbott <labbott@redhat.com> |
| Date: Mon, 10 Sep 2018 16:20:14 -0700 |
| Subject: kgdboc: Fix restrict error |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Laura Abbott <labbott@redhat.com> |
| |
| commit 2dd453168643d9475028cd867c57e65956a0f7f9 upstream. |
| |
| There's an error when compiled with restrict: |
| |
| drivers/tty/serial/kgdboc.c: In function ‘configure_kgdboc’: |
| drivers/tty/serial/kgdboc.c:137:2: error: ‘strcpy’ source argument is the same |
| as destination [-Werror=restrict] |
| strcpy(config, opt); |
| ^~~~~~~~~~~~~~~~~~~ |
| |
| As the error implies, this is from trying to use config as both source and |
| destination. Drop the call to the function where config is the argument |
| since nothing else happens in the function. |
| |
| Signed-off-by: Laura Abbott <labbott@redhat.com> |
| Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/tty/serial/kgdboc.c | 6 ++---- |
| 1 file changed, 2 insertions(+), 4 deletions(-) |
| |
| --- a/drivers/tty/serial/kgdboc.c |
| +++ b/drivers/tty/serial/kgdboc.c |
| @@ -162,15 +162,13 @@ static int configure_kgdboc(void) |
| { |
| struct tty_driver *p; |
| int tty_line = 0; |
| - int err; |
| + int err = -ENODEV; |
| char *cptr = config; |
| struct console *cons; |
| |
| - err = kgdboc_option_setup(config); |
| - if (err || !strlen(config) || isspace(config[0])) |
| + if (!strlen(config) || isspace(config[0])) |
| goto noconfig; |
| |
| - err = -ENODEV; |
| kgdboc_io_ops.is_console = 0; |
| kgdb_tty_driver = NULL; |
| |