From patchwork Mon Sep 19 22:03:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Gortmaker X-Patchwork-Id: 9340713 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5C9A46022E for ; Mon, 19 Sep 2016 22:04:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3FA3E29980 for ; Mon, 19 Sep 2016 22:04:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 33BE7299A1; Mon, 19 Sep 2016 22:04:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6A20C29980 for ; Mon, 19 Sep 2016 22:03:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752978AbcISWD4 (ORCPT ); Mon, 19 Sep 2016 18:03:56 -0400 Received: from mail1.windriver.com ([147.11.146.13]:46027 "EHLO mail1.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752717AbcISWDz (ORCPT ); Mon, 19 Sep 2016 18:03:55 -0400 Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail1.windriver.com (8.15.2/8.15.1) with ESMTPS id u8JM3eFm017737 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL); Mon, 19 Sep 2016 15:03:40 -0700 (PDT) Received: from yow-lpgnfs-02.wrs.com (128.224.149.8) by ALA-HCA.corp.ad.wrs.com (147.11.189.40) with Microsoft SMTP Server id 14.3.294.0; Mon, 19 Sep 2016 15:03:39 -0700 From: Paul Gortmaker To: CC: Paul Gortmaker , Yoshinori Sato , Rich Felker , Subject: [PATCH] sh: migrate exception table users off module.h and onto extable.h Date: Mon, 19 Sep 2016 18:03:35 -0400 Message-ID: <20160919220335.5974-1-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.10.0 MIME-Version: 1.0 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP These files were only including module.h for exception table related functions. We've now separated that content out into its own file "extable.h" so now move over to that and avoid all the extra header content in module.h that we don't really need to compile these files. One uses "print_modules" so that prevents us removing module.h in that case, however. We also delete a duplicate prototype that doesn't need to exist, as it duplicates content in extable.h Cc: Yoshinori Sato Cc: Rich Felker Cc: linux-sh@vger.kernel.org Signed-off-by: Paul Gortmaker --- [see: https://lkml.org/lkml/2016/7/24/224 for additional context if needed] arch/sh/include/asm/uaccess.h | 1 - arch/sh/kernel/kprobes.c | 2 +- arch/sh/kernel/traps.c | 3 ++- arch/sh/mm/extable_32.c | 2 +- arch/sh/mm/extable_64.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/sh/include/asm/uaccess.h b/arch/sh/include/asm/uaccess.h index a49635c51266..94746c806ffc 100644 --- a/arch/sh/include/asm/uaccess.h +++ b/arch/sh/include/asm/uaccess.h @@ -191,7 +191,6 @@ struct exception_table_entry { int fixup_exception(struct pt_regs *regs); /* Returns 0 if exception not found and fixup.unit otherwise. */ unsigned long search_exception_table(unsigned long addr); -const struct exception_table_entry *search_exception_tables(unsigned long addr); extern void *set_exception_table_vec(unsigned int vec, void *handler); diff --git a/arch/sh/kernel/kprobes.c b/arch/sh/kernel/kprobes.c index 83acbf3f6de8..5999df326b43 100644 --- a/arch/sh/kernel/kprobes.c +++ b/arch/sh/kernel/kprobes.c @@ -9,7 +9,7 @@ * for more details. */ #include -#include +#include #include #include #include diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c index dfdad72c61ca..9513fa7840aa 100644 --- a/arch/sh/kernel/traps.c +++ b/arch/sh/kernel/traps.c @@ -8,7 +8,8 @@ #include #include #include -#include +#include +#include /* print_modules */ #include #include diff --git a/arch/sh/mm/extable_32.c b/arch/sh/mm/extable_32.c index c1cf4463d09d..f73d9927805f 100644 --- a/arch/sh/mm/extable_32.c +++ b/arch/sh/mm/extable_32.c @@ -4,7 +4,7 @@ * linux/arch/i386/mm/extable.c */ -#include +#include #include int fixup_exception(struct pt_regs *regs) diff --git a/arch/sh/mm/extable_64.c b/arch/sh/mm/extable_64.c index f05499688d88..f8de5289d119 100644 --- a/arch/sh/mm/extable_64.c +++ b/arch/sh/mm/extable_64.c @@ -11,7 +11,7 @@ * for more details. */ #include -#include +#include #include extern unsigned long copy_user_memcpy, copy_user_memcpy_end;