Commit 82ed1ac9 authored by Paul Gortmaker's avatar Paul Gortmaker
Browse files

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: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
parent 7a308bb3

arch/ia64/include/asm/exception.h

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/*

 * 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
Original line number Diff line number Diff line
@@ -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)

arch/ia64/kernel/kprobes.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

arch/ia64/kernel/traps.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

arch/ia64/kernel/unaligned.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE