Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1564454 > unrolled thread
| Started by | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| First post | 2017-01-22 17:40 +0100 |
| Last post | 2017-01-22 17:40 +0100 |
| Articles | 8 on this page of 28 — 5 participants |
Back to article view | Back to linux.kernel
[PATCH v3 00/20] Finalize separation of extable.h from module.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH 14/20] metag: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH 13/20] arc: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
Re: [PATCH 13/20] arc: migrate exception table users off module.h and onto extable.h Vineet Gupta <Vineet.Gupta1@synopsys.com> - 2017-01-23 22:20 +0100
[PATCH 06/20] mn10300: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH 19/20] core: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH 12/20] nios2: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
Re: [PATCH 12/20] nios2: migrate exception table users off module.h and onto extable.h Tobias Klauser <tklauser@distanz.ch> - 2017-01-25 11:00 +0100
[PATCH 05/20] alpha: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH 18/20] hexagon: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH 16/20] unicore32: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH 02/20] ia64: ensure exception table search users include extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH 10/20] openrisc: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH v2] openrisc: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-25 22:50 +0100
Re: [PATCH v2] openrisc: migrate exception table users off module.h and onto extable.h Stafford Horne <shorne@gmail.com> - 2017-01-26 07:00 +0100
Re: [PATCH v2] openrisc: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-26 16:00 +0100
[PATCH v2] openrisc: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-25 23:50 +0100
[PATCH 09/20] frv: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH 04/20] arm: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH 08/20] sh: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH 20/20] module.h: remove extable.h include now users have migrated Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
Re: [PATCH 20/20] module.h: remove extable.h include now users have migrated kbuild test robot <lkp@intel.com> - 2017-01-23 00:00 +0100
Re: [PATCH 20/20] module.h: remove extable.h include now users have migrated Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-23 05:20 +0100
[PATCH 03/20] m32r: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH 15/20] score: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH 17/20] microblaze: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH 01/20] ia64: move ia64_done_with_exception out of asm/uaccess.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH 07/20] xtensa: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
Page 2 of 2 — ← Prev page 1 [2]
| From | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| Date | 2017-01-22 17:40 +0100 |
| Subject | [PATCH 20/20] module.h: remove extable.h include now users have migrated |
| Message-ID | <t2tlp-33i-55@gated-at.bofh.it> |
| In reply to | #1564454 |
With hopefully most/all users of module.h that were looking for exception table functions moved over to the new extable.h header, we can remove the back-compat include that let us transition without introducing build regressions. Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- include/linux/module.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/linux/module.h b/include/linux/module.h index 7c84273d60b9..2e6df4c41c86 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -18,7 +18,6 @@ #include <linux/moduleparam.h> #include <linux/jump_label.h> #include <linux/export.h> -#include <linux/extable.h> /* only as arch move module.h -> extable.h */ #include <linux/rbtree_latch.h> #include <linux/percpu.h> -- 2.11.0
[toc] | [prev] | [next] | [standalone]
| From | kbuild test robot <lkp@intel.com> |
|---|---|
| Date | 2017-01-23 00:00 +0100 |
| Subject | Re: [PATCH 20/20] module.h: remove extable.h include now users have migrated |
| Message-ID | <t2zh8-6JM-9@gated-at.bofh.it> |
| In reply to | #1564469 |
[Multipart message — attachments visible in raw view] — view raw
Hi Paul,
[auto build test ERROR on linus/master]
[also build test ERROR on v4.10-rc5 next-20170120]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Paul-Gortmaker/ia64-move-ia64_done_with_exception-out-of-asm-uaccess-h/20170123-004155
config: cris-etraxfs_defconfig (attached as .config)
compiler: cris-linux-gcc (GCC) 6.2.0
reproduce:
wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=cris
All error/warnings (new ones prefixed by >>):
arch/cris/arch-v32/kernel/traps.c: In function 'fixup_BUG':
>> arch/cris/arch-v32/kernel/traps.c:159:11: error: implicit declaration of function 'search_exception_tables' [-Werror=implicit-function-declaration]
fixup = search_exception_tables(instruction_pointer(regs) - 2);
^~~~~~~~~~~~~~~~~~~~~~~
>> arch/cris/arch-v32/kernel/traps.c:159:9: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
fixup = search_exception_tables(instruction_pointer(regs) - 2);
^
cc1: some warnings being treated as errors
vim +/search_exception_tables +159 arch/cris/arch-v32/kernel/traps.c
51533b61 Mikael Starvik 2005-07-27 143
9ce1ea75 Jesper Nilsson 2007-12-03 144 void fixup_BUG(struct pt_regs *regs)
51533b61 Mikael Starvik 2005-07-27 145 {
9ce1ea75 Jesper Nilsson 2007-12-03 146 BUG_regs = *regs;
9ce1ea75 Jesper Nilsson 2007-12-03 147
9ce1ea75 Jesper Nilsson 2007-12-03 148 #ifdef CONFIG_DEBUG_BUGVERBOSE
9ce1ea75 Jesper Nilsson 2007-12-03 149 /*
9ce1ea75 Jesper Nilsson 2007-12-03 150 * Fixup the BUG arguments through exception handlers.
9ce1ea75 Jesper Nilsson 2007-12-03 151 */
9ce1ea75 Jesper Nilsson 2007-12-03 152 {
9ce1ea75 Jesper Nilsson 2007-12-03 153 const struct exception_table_entry *fixup;
9ce1ea75 Jesper Nilsson 2007-12-03 154
9ce1ea75 Jesper Nilsson 2007-12-03 155 /*
9ce1ea75 Jesper Nilsson 2007-12-03 156 * ERP points at the "break 14" + 2, compensate for the 2
9ce1ea75 Jesper Nilsson 2007-12-03 157 * bytes.
9ce1ea75 Jesper Nilsson 2007-12-03 158 */
9ce1ea75 Jesper Nilsson 2007-12-03 @159 fixup = search_exception_tables(instruction_pointer(regs) - 2);
9ce1ea75 Jesper Nilsson 2007-12-03 160 if (fixup) {
9ce1ea75 Jesper Nilsson 2007-12-03 161 /* Adjust the instruction pointer in the stackframe. */
9ce1ea75 Jesper Nilsson 2007-12-03 162 instruction_pointer(regs) = fixup->fixup;
9ce1ea75 Jesper Nilsson 2007-12-03 163 arch_fixup(regs);
51533b61 Mikael Starvik 2005-07-27 164 }
9ce1ea75 Jesper Nilsson 2007-12-03 165 }
9ce1ea75 Jesper Nilsson 2007-12-03 166 #else
9ce1ea75 Jesper Nilsson 2007-12-03 167 /* Dont try to lookup the filename + line, just dump regs. */
:::::: The code at line 159 was first introduced by commit
:::::: 9ce1ea751f7256b2248321c2427612a295f15137 CRIS v32: Update and improve kernel/traps.c
:::::: TO: Jesper Nilsson <jesper.nilsson@axis.com>
:::::: CC: Jesper Nilsson <jesper.nilsson@axis.com>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[toc] | [prev] | [next] | [standalone]
| From | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| Date | 2017-01-23 05:20 +0100 |
| Subject | Re: [PATCH 20/20] module.h: remove extable.h include now users have migrated |
| Message-ID | <t2EgO-1Ep-7@gated-at.bofh.it> |
| In reply to | #1564584 |
[Re: [PATCH 20/20] module.h: remove extable.h include now users have migrated] On 23/01/2017 (Mon 06:52) kbuild test robot wrote:
> Hi Paul,
>
> [auto build test ERROR on linus/master]
> [also build test ERROR on v4.10-rc5 next-20170120]
> [if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
>
> url: https://github.com/0day-ci/linux/commits/Paul-Gortmaker/ia64-move-ia64_done_with_exception-out-of-asm-uaccess-h/20170123-004155
> config: cris-etraxfs_defconfig (attached as .config)
Thanks (once again) for the build coverage. I'd actually built cris
(allmodconfig) but strangely enough it didn't show this particular
defconfig issue. I'll fix it to ensure this file includes extable.h
Paul.
--
> compiler: cris-linux-gcc (GCC) 6.2.0
> reproduce:
> wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
> chmod +x ~/bin/make.cross
> # save the attached .config to linux build tree
> make.cross ARCH=cris
>
> All error/warnings (new ones prefixed by >>):
>
> arch/cris/arch-v32/kernel/traps.c: In function 'fixup_BUG':
> >> arch/cris/arch-v32/kernel/traps.c:159:11: error: implicit declaration of function 'search_exception_tables' [-Werror=implicit-function-declaration]
> fixup = search_exception_tables(instruction_pointer(regs) - 2);
> ^~~~~~~~~~~~~~~~~~~~~~~
> >> arch/cris/arch-v32/kernel/traps.c:159:9: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
> fixup = search_exception_tables(instruction_pointer(regs) - 2);
> ^
> cc1: some warnings being treated as errors
>
> vim +/search_exception_tables +159 arch/cris/arch-v32/kernel/traps.c
>
> 51533b61 Mikael Starvik 2005-07-27 143
> 9ce1ea75 Jesper Nilsson 2007-12-03 144 void fixup_BUG(struct pt_regs *regs)
> 51533b61 Mikael Starvik 2005-07-27 145 {
> 9ce1ea75 Jesper Nilsson 2007-12-03 146 BUG_regs = *regs;
> 9ce1ea75 Jesper Nilsson 2007-12-03 147
> 9ce1ea75 Jesper Nilsson 2007-12-03 148 #ifdef CONFIG_DEBUG_BUGVERBOSE
> 9ce1ea75 Jesper Nilsson 2007-12-03 149 /*
> 9ce1ea75 Jesper Nilsson 2007-12-03 150 * Fixup the BUG arguments through exception handlers.
> 9ce1ea75 Jesper Nilsson 2007-12-03 151 */
> 9ce1ea75 Jesper Nilsson 2007-12-03 152 {
> 9ce1ea75 Jesper Nilsson 2007-12-03 153 const struct exception_table_entry *fixup;
> 9ce1ea75 Jesper Nilsson 2007-12-03 154
> 9ce1ea75 Jesper Nilsson 2007-12-03 155 /*
> 9ce1ea75 Jesper Nilsson 2007-12-03 156 * ERP points at the "break 14" + 2, compensate for the 2
> 9ce1ea75 Jesper Nilsson 2007-12-03 157 * bytes.
> 9ce1ea75 Jesper Nilsson 2007-12-03 158 */
> 9ce1ea75 Jesper Nilsson 2007-12-03 @159 fixup = search_exception_tables(instruction_pointer(regs) - 2);
> 9ce1ea75 Jesper Nilsson 2007-12-03 160 if (fixup) {
> 9ce1ea75 Jesper Nilsson 2007-12-03 161 /* Adjust the instruction pointer in the stackframe. */
> 9ce1ea75 Jesper Nilsson 2007-12-03 162 instruction_pointer(regs) = fixup->fixup;
> 9ce1ea75 Jesper Nilsson 2007-12-03 163 arch_fixup(regs);
> 51533b61 Mikael Starvik 2005-07-27 164 }
> 9ce1ea75 Jesper Nilsson 2007-12-03 165 }
> 9ce1ea75 Jesper Nilsson 2007-12-03 166 #else
> 9ce1ea75 Jesper Nilsson 2007-12-03 167 /* Dont try to lookup the filename + line, just dump regs. */
>
> :::::: The code at line 159 was first introduced by commit
> :::::: 9ce1ea751f7256b2248321c2427612a295f15137 CRIS v32: Update and improve kernel/traps.c
>
> :::::: TO: Jesper Nilsson <jesper.nilsson@axis.com>
> :::::: CC: Jesper Nilsson <jesper.nilsson@axis.com>
>
> ---
> 0-DAY kernel test infrastructure Open Source Technology Center
> https://lists.01.org/pipermail/kbuild-all Intel Corporation
[toc] | [prev] | [next] | [standalone]
| From | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| Date | 2017-01-22 17:40 +0100 |
| Subject | [PATCH 03/20] m32r: migrate exception table users off module.h and onto extable.h |
| Message-ID | <t2tlq-33i-69@gated-at.bofh.it> |
| In reply to | #1564454 |
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. Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com> Acked-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- arch/m32r/mm/extable.c | 2 +- arch/m32r/mm/fault.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/m32r/mm/extable.c b/arch/m32r/mm/extable.c index 40ccf80d29cf..8ac8ba6ef60c 100644 --- a/arch/m32r/mm/extable.c +++ b/arch/m32r/mm/extable.c @@ -2,7 +2,7 @@ * linux/arch/m32r/mm/extable.c */ -#include <linux/module.h> +#include <linux/extable.h> #include <linux/uaccess.h> int fixup_exception(struct pt_regs *regs) diff --git a/arch/m32r/mm/fault.c b/arch/m32r/mm/fault.c index a3785d3644c2..a05dc3184594 100644 --- a/arch/m32r/mm/fault.c +++ b/arch/m32r/mm/fault.c @@ -23,7 +23,7 @@ #include <linux/tty.h> #include <linux/vt_kern.h> /* For unblank_screen() */ #include <linux/highmem.h> -#include <linux/module.h> +#include <linux/extable.h> #include <linux/uaccess.h> #include <asm/m32r.h> -- 2.11.0
[toc] | [prev] | [next] | [standalone]
| From | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| Date | 2017-01-22 17:40 +0100 |
| Subject | [PATCH 15/20] score: migrate exception table users off module.h and onto extable.h |
| Message-ID | <t2tlq-33i-73@gated-at.bofh.it> |
| In reply to | #1564454 |
This file was 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 this file.
Cc: Chen Liqin <liqin.linux@gmail.com>
Cc: Lennox Wu <lennox.wu@gmail.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
arch/score/mm/extable.c | 2 +-
arch/score/mm/fault.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/score/mm/extable.c b/arch/score/mm/extable.c
index 01ff6445171c..ec871355fc2d 100644
--- a/arch/score/mm/extable.c
+++ b/arch/score/mm/extable.c
@@ -23,7 +23,7 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <linux/module.h>
+#include <linux/extable.h>
int fixup_exception(struct pt_regs *regs)
{
diff --git a/arch/score/mm/fault.c b/arch/score/mm/fault.c
index 995b71e4db4b..b85fad4f0874 100644
--- a/arch/score/mm/fault.c
+++ b/arch/score/mm/fault.c
@@ -28,7 +28,7 @@
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/mman.h>
-#include <linux/module.h>
+#include <linux/extable.h>
#include <linux/signal.h>
#include <linux/sched.h>
#include <linux/string.h>
--
2.11.0
[toc] | [prev] | [next] | [standalone]
| From | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| Date | 2017-01-22 17:40 +0100 |
| Subject | [PATCH 17/20] microblaze: migrate exception table users off module.h and onto extable.h |
| Message-ID | <t2tlq-33i-71@gated-at.bofh.it> |
| In reply to | #1564454 |
This file was 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 this file. Cc: Michal Simek <monstr@monstr.eu> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- arch/microblaze/mm/fault.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/microblaze/mm/fault.c b/arch/microblaze/mm/fault.c index abb678ccde6f..f91b30f8aaa8 100644 --- a/arch/microblaze/mm/fault.c +++ b/arch/microblaze/mm/fault.c @@ -17,7 +17,7 @@ * */ -#include <linux/module.h> +#include <linux/extable.h> #include <linux/signal.h> #include <linux/sched.h> #include <linux/kernel.h> -- 2.11.0
[toc] | [prev] | [next] | [standalone]
| From | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| Date | 2017-01-22 17:40 +0100 |
| Subject | [PATCH 01/20] ia64: move ia64_done_with_exception out of asm/uaccess.h |
| Message-ID | <t2tlq-33i-75@gated-at.bofh.it> |
| In reply to | #1564454 |
Move ia64_done_with_exception out of asm/uaccess.h (which is widely
used) and into asm/exception.h (like ARM has) and then ensure the
few callers of it include this new header.
Most of the other C content in asm files is implemented in macro form.
So we do that conversion at the same time as the move.
There are two C exception prototypes that move along with the macro.
One of them will become redundant when we switch over to using the
<linux/extable.h> instead of <linux/module.h> header in a subsequent
commit.
Also relocate a couple of the automated asm --> linux uaccess
conversions to preserve the linux and asm independent grouping, since
we are in the file at that location anyway.
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: linux-ia64@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
arch/ia64/include/asm/exception.h | 36 ++++++++++++++++++++++++++++++++++++
arch/ia64/include/asm/uaccess.h | 15 ---------------
arch/ia64/kernel/kprobes.c | 2 +-
arch/ia64/kernel/traps.c | 3 ++-
arch/ia64/kernel/unaligned.c | 3 ++-
arch/ia64/mm/fault.c | 1 +
6 files changed, 42 insertions(+), 18 deletions(-)
create mode 100644 arch/ia64/include/asm/exception.h
diff --git a/arch/ia64/include/asm/exception.h b/arch/ia64/include/asm/exception.h
new file mode 100644
index 000000000000..d90236090e8c
--- /dev/null
+++ b/arch/ia64/include/asm/exception.h
@@ -0,0 +1,36 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef __ASM_EXCEPTION_H
+#define __ASM_EXCEPTION_H
+
+struct pt_regs;
+struct exception_table_entry;
+
+extern void ia64_handle_exception(struct pt_regs *regs,
+ const struct exception_table_entry *e);
+extern const struct exception_table_entry *search_exception_tables(unsigned long addr);
+
+#define ia64_done_with_exception(regs) \
+({ \
+ int __ex_ret = 0; \
+ const struct exception_table_entry *e; \
+ e = search_exception_tables((regs)->cr_iip + ia64_psr(regs)->ri); \
+ if (e) { \
+ ia64_handle_exception(regs, e); \
+ __ex_ret = 1; \
+ } \
+ __ex_ret; \
+})
+
+#endif /* __ASM_EXCEPTION_H */
diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
index bfe13196f770..471044be2a3b 100644
--- a/arch/ia64/include/asm/uaccess.h
+++ b/arch/ia64/include/asm/uaccess.h
@@ -353,21 +353,6 @@ struct exception_table_entry {
int fixup; /* location-relative continuation addr.; if bit 2 is set, r9 is set to 0 */
};
-extern void ia64_handle_exception (struct pt_regs *regs, const struct exception_table_entry *e);
-extern const struct exception_table_entry *search_exception_tables (unsigned long addr);
-
-static inline int
-ia64_done_with_exception (struct pt_regs *regs)
-{
- const struct exception_table_entry *e;
- e = search_exception_tables(regs->cr_iip + ia64_psr(regs)->ri);
- if (e) {
- ia64_handle_exception(regs, e);
- return 1;
- }
- return 0;
-}
-
#define ARCH_HAS_TRANSLATE_MEM_PTR 1
static __inline__ void *
xlate_dev_mem_ptr(phys_addr_t p)
diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c
index 45ff27e9edbb..55b18e1b67a8 100644
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
@@ -33,7 +33,7 @@
#include <asm/pgtable.h>
#include <asm/sections.h>
-#include <linux/uaccess.h>
+#include <asm/exception.h>
extern void jprobe_inst_return(void);
diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c
index 095bfaff82d0..d3e1f1ee465f 100644
--- a/arch/ia64/kernel/traps.c
+++ b/arch/ia64/kernel/traps.c
@@ -17,11 +17,12 @@
#include <linux/kprobes.h>
#include <linux/delay.h> /* for ssleep() */
#include <linux/kdebug.h>
+#include <linux/uaccess.h>
#include <asm/fpswa.h>
#include <asm/intrinsics.h>
#include <asm/processor.h>
-#include <linux/uaccess.h>
+#include <asm/exception.h>
#include <asm/setup.h>
fpswa_interface_t *fpswa_interface;
diff --git a/arch/ia64/kernel/unaligned.c b/arch/ia64/kernel/unaligned.c
index 9cd01c2200ee..e697403b0ec1 100644
--- a/arch/ia64/kernel/unaligned.c
+++ b/arch/ia64/kernel/unaligned.c
@@ -18,11 +18,12 @@
#include <linux/sched.h>
#include <linux/tty.h>
#include <linux/ratelimit.h>
+#include <linux/uaccess.h>
#include <asm/intrinsics.h>
#include <asm/processor.h>
#include <asm/rse.h>
-#include <linux/uaccess.h>
+#include <asm/exception.h>
#include <asm/unaligned.h>
extern int die_if_kernel(char *str, struct pt_regs *regs, long err);
diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
index fa6ad95e992e..52b41dad9704 100644
--- a/arch/ia64/mm/fault.c
+++ b/arch/ia64/mm/fault.c
@@ -15,6 +15,7 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
+#include <asm/exception.h>
extern int die(char *, struct pt_regs *, long);
--
2.11.0
[toc] | [prev] | [next] | [standalone]
| From | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| Date | 2017-01-22 17:40 +0100 |
| Subject | [PATCH 07/20] xtensa: migrate exception table users off module.h and onto extable.h |
| Message-ID | <t2tlq-33i-77@gated-at.bofh.it> |
| In reply to | #1564454 |
This file was 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 this file. Cc: Chris Zankel <chris@zankel.net> Cc: Max Filippov <jcmvbkbc@gmail.com> Cc: linux-xtensa@linux-xtensa.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- arch/xtensa/mm/fault.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/xtensa/mm/fault.c b/arch/xtensa/mm/fault.c index 2725e08ef353..a14df5aa98c8 100644 --- a/arch/xtensa/mm/fault.c +++ b/arch/xtensa/mm/fault.c @@ -13,7 +13,7 @@ */ #include <linux/mm.h> -#include <linux/module.h> +#include <linux/extable.h> #include <linux/hardirq.h> #include <linux/perf_event.h> #include <linux/uaccess.h> -- 2.11.0
[toc] | [prev] | [standalone]
Page 2 of 2 — ← Prev page 1 [2]
Back to top | Article view | linux.kernel
csiph-web