summaryrefslogtreecommitdiffstats
path: root/arch/microblaze
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-12-25 14:34:44 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2017-03-28 18:23:43 -0400
commit730132e7e52210cbbfa95af67f5e23a63199c13d (patch)
tree8a651bd3004d4cb8fef1beab9266d731a3e1ab41 /arch/microblaze
parentd597580d373774b1bdab84b3d26ff0b55162b916 (diff)
microblaze: switch to generic extable.h
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/microblaze')
-rw-r--r--arch/microblaze/include/asm/Kbuild1
-rw-r--r--arch/microblaze/include/asm/uaccess.h17
2 files changed, 2 insertions, 16 deletions
diff --git a/arch/microblaze/include/asm/Kbuild b/arch/microblaze/include/asm/Kbuild
index 1732ec13b211..56830ff65333 100644
--- a/arch/microblaze/include/asm/Kbuild
+++ b/arch/microblaze/include/asm/Kbuild
@@ -3,6 +3,7 @@ generic-y += barrier.h
3generic-y += clkdev.h 3generic-y += clkdev.h
4generic-y += device.h 4generic-y += device.h
5generic-y += exec.h 5generic-y += exec.h
6generic-y += extable.h
6generic-y += irq_work.h 7generic-y += irq_work.h
7generic-y += mcs_spinlock.h 8generic-y += mcs_spinlock.h
8generic-y += mm-arch-hooks.h 9generic-y += mm-arch-hooks.h
diff --git a/arch/microblaze/include/asm/uaccess.h b/arch/microblaze/include/asm/uaccess.h
index b132cd301e66..2c39375ac871 100644
--- a/arch/microblaze/include/asm/uaccess.h
+++ b/arch/microblaze/include/asm/uaccess.h
@@ -17,6 +17,7 @@
17#include <asm/mmu.h> 17#include <asm/mmu.h>
18#include <asm/page.h> 18#include <asm/page.h>
19#include <asm/pgtable.h> 19#include <asm/pgtable.h>
20#include <asm/extable.h>
20#include <linux/string.h> 21#include <linux/string.h>
21 22
22/* 23/*
@@ -47,22 +48,6 @@
47 48
48# define segment_eq(a, b) ((a).seg == (b).seg) 49# define segment_eq(a, b) ((a).seg == (b).seg)
49 50
50/*
51 * The exception table consists of pairs of addresses: the first is the
52 * address of an instruction that is allowed to fault, and the second is
53 * the address at which the program should continue. No registers are
54 * modified, so it is entirely up to the continuation code to figure out
55 * what to do.
56 *
57 * All the routines below use bits of fixup code that are out of line
58 * with the main instruction path. This means when everything is well,
59 * we don't even have to jump over them. Further, they do not intrude
60 * on our cache or tlb entries.
61 */
62struct exception_table_entry {
63 unsigned long insn, fixup;
64};
65
66#ifndef CONFIG_MMU 51#ifndef CONFIG_MMU
67 52
68/* Check against bounds of physical memory */ 53/* Check against bounds of physical memory */