Commit aaa2e7ac authored by Al Viro's avatar Al Viro

add asm-generic/extable.h

... and make the users of generic uaccess.h use that.
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 444f02c4
...@@ -6,6 +6,7 @@ generic-y += device.h ...@@ -6,6 +6,7 @@ generic-y += device.h
generic-y += div64.h generic-y += div64.h
generic-y += emergency-restart.h generic-y += emergency-restart.h
generic-y += errno.h generic-y += errno.h
generic-y += extable.h
generic-y += fb.h generic-y += fb.h
generic-y += fcntl.h generic-y += fcntl.h
generic-y += ftrace.h generic-y += ftrace.h
......
...@@ -750,6 +750,4 @@ extern long arc_strnlen_user_noinline(const char __user *src, long n); ...@@ -750,6 +750,4 @@ extern long arc_strnlen_user_noinline(const char __user *src, long n);
#include <asm-generic/uaccess.h> #include <asm-generic/uaccess.h>
extern int fixup_exception(struct pt_regs *regs);
#endif #endif
...@@ -12,6 +12,7 @@ generic-y += dma.h ...@@ -12,6 +12,7 @@ generic-y += dma.h
generic-y += emergency-restart.h generic-y += emergency-restart.h
generic-y += errno.h generic-y += errno.h
generic-y += exec.h generic-y += exec.h
generic-y += extable.h
generic-y += fb.h generic-y += fb.h
generic-y += fcntl.h generic-y += fcntl.h
generic-y += futex.h generic-y += futex.h
......
...@@ -13,6 +13,7 @@ generic-y += dma.h ...@@ -13,6 +13,7 @@ generic-y += dma.h
generic-y += emergency-restart.h generic-y += emergency-restart.h
generic-y += errno.h generic-y += errno.h
generic-y += exec.h generic-y += exec.h
generic-y += extable.h
generic-y += fb.h generic-y += fb.h
generic-y += fcntl.h generic-y += fcntl.h
generic-y += ftrace.h generic-y += ftrace.h
......
...@@ -11,6 +11,7 @@ generic-y += device.h ...@@ -11,6 +11,7 @@ generic-y += device.h
generic-y += div64.h generic-y += div64.h
generic-y += emergency-restart.h generic-y += emergency-restart.h
generic-y += errno.h generic-y += errno.h
generic-y += extable.h
generic-y += fb.h generic-y += fb.h
generic-y += fcntl.h generic-y += fcntl.h
generic-y += ftrace.h generic-y += ftrace.h
......
...@@ -6,6 +6,7 @@ generic-y += delay.h ...@@ -6,6 +6,7 @@ generic-y += delay.h
generic-y += device.h generic-y += device.h
generic-y += emergency-restart.h generic-y += emergency-restart.h
generic-y += exec.h generic-y += exec.h
generic-y += extable.h
generic-y += ftrace.h generic-y += ftrace.h
generic-y += futex.h generic-y += futex.h
generic-y += hardirq.h generic-y += hardirq.h
......
...@@ -10,6 +10,7 @@ generic-y += div64.h ...@@ -10,6 +10,7 @@ generic-y += div64.h
generic-y += emergency-restart.h generic-y += emergency-restart.h
generic-y += errno.h generic-y += errno.h
generic-y += exec.h generic-y += exec.h
generic-y += extable.h
generic-y += fb.h generic-y += fb.h
generic-y += fcntl.h generic-y += fcntl.h
generic-y += ftrace.h generic-y += ftrace.h
......
...@@ -38,6 +38,4 @@ __strnlen_user(const char __user *s, long n); ...@@ -38,6 +38,4 @@ __strnlen_user(const char __user *s, long n);
#include <asm-generic/uaccess.h> #include <asm-generic/uaccess.h>
extern int fixup_exception(struct pt_regs *regs);
#endif /* __UNICORE_UACCESS_H__ */ #endif /* __UNICORE_UACCESS_H__ */
#ifndef __ASM_GENERIC_EXTABLE_H
#define __ASM_GENERIC_EXTABLE_H
/*
* The exception table consists of pairs of addresses: the first is the
* address of an instruction that is allowed to fault, and the second is
* the address at which the program should continue. No registers are
* modified, so it is entirely up to the continuation code to figure out
* what to do.
*
* All the routines below use bits of fixup code that are out of line
* with the main instruction path. This means when everything is well,
* we don't even have to jump over them. Further, they do not intrude
* on our cache or tlb entries.
*/
struct exception_table_entry
{
unsigned long insn, fixup;
};
struct pt_regs;
extern int fixup_exception(struct pt_regs *regs);
#endif
...@@ -47,24 +47,6 @@ static inline int __access_ok(unsigned long addr, unsigned long size) ...@@ -47,24 +47,6 @@ static inline int __access_ok(unsigned long addr, unsigned long size)
} }
#endif #endif
/*
* The exception table consists of pairs of addresses: the first is the
* address of an instruction that is allowed to fault, and the second is
* the address at which the program should continue. No registers are
* modified, so it is entirely up to the continuation code to figure out
* what to do.
*
* All the routines below use bits of fixup code that are out of line
* with the main instruction path. This means when everything is well,
* we don't even have to jump over them. Further, they do not intrude
* on our cache or tlb entries.
*/
struct exception_table_entry
{
unsigned long insn, fixup;
};
/* /*
* architectures with an MMU should override these two * architectures with an MMU should override these two
*/ */
...@@ -344,4 +326,6 @@ clear_user(void __user *to, unsigned long n) ...@@ -344,4 +326,6 @@ clear_user(void __user *to, unsigned long n)
return __clear_user(to, n); return __clear_user(to, n);
} }
#include <asm/extable.h>
#endif /* __ASM_GENERIC_UACCESS_H */ #endif /* __ASM_GENERIC_UACCESS_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment