aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2017-04-02 10:51:58 -0400
committerHelge Deller <deller@gmx.de>2017-05-10 11:46:13 -0400
commitc3e5523fcffdc9df8faa7d66f5ad8c1c833e1795 (patch)
tree6b49b3c65028a1aab7e5cd07e0cc4072a729cf09
parent741394ca54ac6701841a46a84cfa9a0a4ddd6969 (diff)
parisc: Drop per_cpu uaccess related exception_data struct
The last users have been migrated off by commits d19f5e41b344 ("parisc: Clean up fixup routines for get_user()/put_user()") and 554bfeceb8a2 ("parisc: Fix access fault handling in pa_memcpy()"). Signed-off-by: Helge Deller <deller@gmx.de>
-rw-r--r--arch/parisc/include/asm/uaccess.h11
-rw-r--r--arch/parisc/kernel/asm-offsets.c5
-rw-r--r--arch/parisc/mm/fault.c9
3 files changed, 0 insertions, 25 deletions
diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
index 6b113f39f30c..c3e114f67485 100644
--- a/arch/parisc/include/asm/uaccess.h
+++ b/arch/parisc/include/asm/uaccess.h
@@ -69,17 +69,6 @@ struct exception_table_entry {
69 ASM_EXCEPTIONTABLE_ENTRY( fault_addr, except_addr + 1) 69 ASM_EXCEPTIONTABLE_ENTRY( fault_addr, except_addr + 1)
70 70
71/* 71/*
72 * The page fault handler stores, in a per-cpu area, the following information
73 * if a fixup routine is available.
74 */
75struct exception_data {
76 unsigned long fault_ip;
77 unsigned long fault_gp;
78 unsigned long fault_space;
79 unsigned long fault_addr;
80};
81
82/*
83 * load_sr2() preloads the space register %%sr2 - based on the value of 72 * load_sr2() preloads the space register %%sr2 - based on the value of
84 * get_fs() - with either a value of 0 to access kernel space (KERNEL_DS which 73 * get_fs() - with either a value of 0 to access kernel space (KERNEL_DS which
85 * is 0), or with the current value of %%sr3 to access user space (USER_DS) 74 * is 0), or with the current value of %%sr3 to access user space (USER_DS)
diff --git a/arch/parisc/kernel/asm-offsets.c b/arch/parisc/kernel/asm-offsets.c
index 1c4fe61a592b..dfff8a0d6fd1 100644
--- a/arch/parisc/kernel/asm-offsets.c
+++ b/arch/parisc/kernel/asm-offsets.c
@@ -298,11 +298,6 @@ int main(void)
298 DEFINE(HUGEPAGE_SIZE, PAGE_SIZE); 298 DEFINE(HUGEPAGE_SIZE, PAGE_SIZE);
299#endif 299#endif
300 BLANK(); 300 BLANK();
301 DEFINE(EXCDATA_IP, offsetof(struct exception_data, fault_ip));
302 DEFINE(EXCDATA_GP, offsetof(struct exception_data, fault_gp));
303 DEFINE(EXCDATA_SPACE, offsetof(struct exception_data, fault_space));
304 DEFINE(EXCDATA_ADDR, offsetof(struct exception_data, fault_addr));
305 BLANK();
306 DEFINE(ASM_PDC_RESULT_SIZE, NUM_PDC_RESULT * sizeof(unsigned long)); 301 DEFINE(ASM_PDC_RESULT_SIZE, NUM_PDC_RESULT * sizeof(unsigned long));
307 BLANK(); 302 BLANK();
308 return 0; 303 return 0;
diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
index 32ec22146141..fdc34cf4eb0e 100644
--- a/arch/parisc/mm/fault.c
+++ b/arch/parisc/mm/fault.c
@@ -29,8 +29,6 @@
29#define BITSSET 0x1c0 /* for identifying LDCW */ 29#define BITSSET 0x1c0 /* for identifying LDCW */
30 30
31 31
32DEFINE_PER_CPU(struct exception_data, exception_data);
33
34int show_unhandled_signals = 1; 32int show_unhandled_signals = 1;
35 33
36/* 34/*
@@ -143,13 +141,6 @@ int fixup_exception(struct pt_regs *regs)
143 141
144 fix = search_exception_tables(regs->iaoq[0]); 142 fix = search_exception_tables(regs->iaoq[0]);
145 if (fix) { 143 if (fix) {
146 struct exception_data *d;
147 d = this_cpu_ptr(&exception_data);
148 d->fault_ip = regs->iaoq[0];
149 d->fault_gp = regs->gr[27];
150 d->fault_space = regs->isr;
151 d->fault_addr = regs->ior;
152
153 /* 144 /*
154 * Fix up get_user() and put_user(). 145 * Fix up get_user() and put_user().
155 * ASM_EXCEPTIONTABLE_ENTRY_EFAULT() sets the least-significant 146 * ASM_EXCEPTIONTABLE_ENTRY_EFAULT() sets the least-significant