Gitweb: http://git.kernel.org/linus/357bc3c9284b2fb201786176e8187d2273323bc1
Commit: 357bc3c9284b2fb201786176e8187d2273323bc1
Parent: 40db0834337ef0cde586feeb5588e45f0349098b
Author: Michal Simek <monstr@monstr.eu>
AuthorDate: Fri Mar 5 15:37:57 2010 +0100
Committer: Michal Simek <monstr@monstr.eu>
CommitDate: Thu Apr 1 08:38:19 2010 +0200
microblaze: Move exception_table_entry upward
Just sort to be able remove whole block.
Signed-off-by: Michal Simek <monstr@monstr.eu>
---
arch/microblaze/include/asm/uaccess.h | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/arch/microblaze/include/asm/uaccess.h b/arch/microblaze/include/asm/uaccess.h
index a8f794d..e2adad3 100644
--- a/arch/microblaze/include/asm/uaccess.h
+++ b/arch/microblaze/include/asm/uaccess.h
@@ -55,6 +55,21 @@
# define segment_eq(a, b) ((a).seg == (b).seg)
+/*
+ * 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;
+};
#define __clear_user(addr, n) (memset((void *)(addr), 0, (n)), 0)
@@ -333,22 +348,6 @@ extern int __strnlen_user(const char __user *sstr, int len);
extern unsigned long __copy_tofrom_user(void __user *to,
const void __user *from, unsigned long size);
-/*
- * 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;
-};
-
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
