ia64: make use of new extable.h header
v2 cover ia64: make use of new extable.h header
[v1 -> v2: de-pollute uaccess.h as per what Al Viro's comments implied]
We forked the exception table content out of module.h into a new extable.h file[1]. We temporarily include extable.h into the module.h itself. Now we work our way across the arch independent and arch specific files needing just exception table content, and move them off module.h and onto extable.h
Once that is done, we can remove the extable.h from module.h and in doing it like this, we avoid introducing build failures into the git history.
Here we move ia64 onto using the new arch independent header, and in doing so we also spin off some ia64 exception specific code from the uaccess.h header into a new exception.h header -- based on comments from the v1 review[2] suggesting uaccess.h was not the best place.
Build tested on the intermediate and final commit on top of linux-next, but not runtime tested.
Paul.
[1] https://lkml.kernel.org/r/CA+55aFyDw_jK609LcjpWvVMTzCWuH6nLUXiZDeYC2tpSaZqhXA@mail.gmail.com
[2] https://lkml.kernel.org/r/[email protected]
Signature · 15 lines
Paul Gortmaker (2): ia64: move ia64_done_with_exception out of asm/uaccess.h ia64: ensure exception table search users include extable.h arch/ia64/include/asm/exception.h | 35 +++++++++++++++++++++++++++++++++++ arch/ia64/include/asm/uaccess.h | 15 --------------- arch/ia64/kernel/kprobes.c | 4 ++-- arch/ia64/kernel/traps.c | 4 +++- arch/ia64/kernel/unaligned.c | 2 ++ arch/ia64/mm/fault.c | 2 ++ 6 files changed, 44 insertions(+), 18 deletions(-) create mode 100644 arch/ia64/include/asm/exception.h -- 2.10.0
PATCH v2 1/2 ia64: move ia64_done_with_exception out of asm/uaccess.h
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.
--- 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 | 1 + arch/ia64/kernel/unaligned.c | 1 + arch/ia64/mm/fault.c | 1 + 6 files changed, 40 insertions(+), 16 deletions(-) create mode 100644 arch/ia64/include/asm/exception.h
arch/ia64/include/asm/exception.h new file +36 -0
@@ -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 */
arch/ia64/include/asm/uaccess.h +0 -15
@@ -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 1static __inline__void *xlate_dev_mem_ptr (phys_addr_t p)
arch/ia64/kernel/kprobes.c +1 -1
@@ -33,7 +33,7 @@#include <asm/pgtable.h> #include <asm/sections.h> -#include <asm/uaccess.h> +#include <asm/exception.h> extern void jprobe_inst_return (void );
arch/ia64/kernel/traps.c +1 -0
@@ -21,6 +21,7 @@#include <asm/fpswa.h> #include <asm/intrinsics.h> #include <asm/processor.h> +#include <asm/exception.h> #include <asm/uaccess.h> #include <asm/setup.h>
arch/ia64/kernel/unaligned.c +1 -0
@@ -23,6 +23,7 @@#include <asm/processor.h> #include <asm/rse.h> #include <asm/uaccess.h> +#include <asm/exception.h> #include <asm/unaligned.h> extern int die_if_kernel (char *str,struct pt_regs *regs,long err);
arch/ia64/mm/fault.c +1 -0
@@ -15,6 +15,7 @@#include <asm/pgtable.h> #include <asm/processor.h> +#include <asm/exception.h> extern int die (char *,struct pt_regs *,long );
Signature · 1 line
2.10.0
PATCH v2 2/2 ia64: ensure exception table search users include extable.h
In reply to Paul GortmakerWe start with a delete of a duplicate prototype in asm/exception.h that no longer needs to exist, as it duplicates content in extable.h and since that header is so small, there is no point trying to avoid using it.
Then we make sure anyone using search_exception_tables directly or via the ia64_done_with_exception macro has included extable.h
In the process, we remove an include of moduleloader.h that was apparently not really required; it would have been fetching in module.h and hence the previous location of the exception search function prototypes, but we need not rely on that anymore.
--- arch/ia64/include/asm/exception.h | 1 - arch/ia64/kernel/kprobes.c | 2 +- arch/ia64/kernel/traps.c | 3 ++- arch/ia64/kernel/unaligned.c | 1 + arch/ia64/mm/fault.c | 1 + 5 files changed, 5 insertions(+), 3 deletions(-)
arch/ia64/include/asm/exception.h +0 -1
@@ -19,7 +19,6 @@ 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) \ ({ \
arch/ia64/kernel/kprobes.c +1 -1
@@ -28,7 +28,7 @@#include <linux/string.h> #include <linux/slab.h> #include <linux/preempt.h> -#include <linux/moduleloader.h> +#include <linux/extable.h> #include <linux/kdebug.h> #include <asm/pgtable.h>
arch/ia64/kernel/traps.c +2 -1
@@ -12,7 +12,8 @@#include <linux/sched.h> #include <linux/tty.h> #include <linux/vt_kern.h> /* For unblank_screen() */ -#include <linux/module.h> /* for EXPORT_SYMBOL */ +#include <linux/export.h> +#include <linux/extable.h> #include <linux/hardirq.h> #include <linux/kprobes.h> #include <linux/delay.h> /* for ssleep() */
arch/ia64/kernel/unaligned.c +1 -0
@@ -17,6 +17,7 @@#include <linux/kernel.h> #include <linux/sched.h> #include <linux/tty.h> +#include <linux/extable.h> #include <linux/ratelimit.h> #include <asm/intrinsics.h>
arch/ia64/mm/fault.c +1 -0
@@ -7,6 +7,7 @@#include <linux/sched.h> #include <linux/kernel.h> #include <linux/mm.h> +#include <linux/extable.h> #include <linux/interrupt.h> #include <linux/kprobes.h> #include <linux/kdebug.h>
Signature · 1 line
2.10.0