| From 9c9012e3b3bba6310a4218f0033855a29d73a6d2 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 30 Sep 2019 19:15:12 -0700 |
| Subject: tty: n_hdlc: fix build on SPARC |
| |
| From: Randy Dunlap <rdunlap@infradead.org> |
| |
| [ Upstream commit 47a7e5e97d4edd7b14974d34f0e5a5560fad2915 ] |
| |
| Fix tty driver build on SPARC by not using __exitdata. |
| It appears that SPARC does not support section .exit.data. |
| |
| Fixes these build errors: |
| |
| `.exit.data' referenced in section `.exit.text' of drivers/tty/n_hdlc.o: defined in discarded section `.exit.data' of drivers/tty/n_hdlc.o |
| `.exit.data' referenced in section `.exit.text' of drivers/tty/n_hdlc.o: defined in discarded section `.exit.data' of drivers/tty/n_hdlc.o |
| `.exit.data' referenced in section `.exit.text' of drivers/tty/n_hdlc.o: defined in discarded section `.exit.data' of drivers/tty/n_hdlc.o |
| `.exit.data' referenced in section `.exit.text' of drivers/tty/n_hdlc.o: defined in discarded section `.exit.data' of drivers/tty/n_hdlc.o |
| |
| Reported-by: kbuild test robot <lkp@intel.com> |
| Fixes: 063246641d4a ("format-security: move static strings to const") |
| Signed-off-by: Randy Dunlap <rdunlap@infradead.org> |
| Cc: Kees Cook <keescook@chromium.org> |
| Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Cc: "David S. Miller" <davem@davemloft.net> |
| Cc: Andrew Morton <akpm@linux-foundation.org> |
| Link: https://lore.kernel.org/r/675e7bd9-955b-3ff3-1101-a973b58b5b75@infradead.org |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/tty/n_hdlc.c | 5 +++++ |
| 1 file changed, 5 insertions(+) |
| |
| diff --git a/drivers/tty/n_hdlc.c b/drivers/tty/n_hdlc.c |
| index e55c79eb64309..98361acd3053f 100644 |
| --- a/drivers/tty/n_hdlc.c |
| +++ b/drivers/tty/n_hdlc.c |
| @@ -968,6 +968,11 @@ static int __init n_hdlc_init(void) |
| |
| } /* end of init_module() */ |
| |
| +#ifdef CONFIG_SPARC |
| +#undef __exitdata |
| +#define __exitdata |
| +#endif |
| + |
| static const char hdlc_unregister_ok[] __exitdata = |
| KERN_INFO "N_HDLC: line discipline unregistered\n"; |
| static const char hdlc_unregister_fail[] __exitdata = |
| -- |
| 2.20.1 |
| |