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. 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: linux-ia64@vger.kernel.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
This commit is contained in:
36
arch/ia64/include/asm/exception.h
Normal file
36
arch/ia64/include/asm/exception.h
Normal file
@@ -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 */
|
Reference in New Issue
Block a user