parisc: Implement __get/put_kernel_nofault()
Helge Deller
maintainerPATCH 1/1 parisc: Implement __get/put_kernel_nofault()
Remove CONFIG_SET_FS from parisc, so we need to add __get_kernel_nofault() and __put_kernel_nofault(), define HAVE_GET_KERNEL_NOFAULT and remove set_fs(), get_fs(), load_sr2(), thread_info->addr_limit, KERNEL_DS and USER_DS.
The nice side-effect of this patch is that we now can directly access userspace via sr3 without the need to use a temporary sr2 which is either copied from sr3 or set to zero (for kernel space).
Signed-off-by Helge Deller <[email protected]>
Suggested-by Arnd Bergmann <[email protected]>
--- arch/parisc/Kconfig | 1 - arch/parisc/include/asm/processor.h | 4 - arch/parisc/include/asm/thread_info.h | 2 - arch/parisc/include/asm/uaccess.h | 122 +++++++++++++------------- arch/parisc/kernel/asm-offsets.c | 1 - arch/parisc/lib/lusercopy.S | 18 +--- 6 files changed, 62 insertions(+), 86 deletions(-)
arch/parisc/Kconfig +0 -1
@@ -64,7 +64,6 @@ config PARISC select HAVE_KPROBES_ON_FTRACE select HAVE_DYNAMIC_FTRACE_WITH_REGS select HAVE_SOFTIRQ_ON_OWN_STACK if IRQSTACKS - select SET_FS help The PA-RISC microprocessor is designed by Hewlett-Packard and used
arch/parisc/include/asm/processor.h +0 -4
@@ -101,10 +101,6 @@ DECLARE_PER_CPU(struct cpuinfo_parisc, cpu_data);#define CPU_HVERSION ((boot_cpu_data.hversion >> 4) & 0x0FFF) -typedef struct { -int seg; -}mm_segment_t ; -#define ARCH_MIN_TASKALIGN 8struct thread_struct {
arch/parisc/include/asm/thread_info.h +0 -2
@@ -11,7 +11,6 @@struct thread_info {struct task_struct *task;/* main task structure */ unsigned long flags;/* thread_info flags (see TIF_*) */ -mm_segment_t addr_limit;/* user-level address space limit */ __u32 cpu;/* current CPU */ int preempt_count;/* 0=premptable, <0=BUG; will also serve as bh-counter */ };
@@ -21,7 +20,6 @@ struct thread_info { .task = &tsk, \ .flags = 0, \ .cpu = 0, \ - .addr_limit = KERNEL_DS, \ .preempt_count = INIT_PREEMPT_COUNT, \ }
arch/parisc/include/asm/uaccess.h +61 -61
210 lines not on this page · raw message
arch/parisc/kernel/asm-offsets.c +0 -1
@@ -230,7 +230,6 @@ int main(void)DEFINE (TI_TASK , offsetof(struct thread_info , task));DEFINE (TI_FLAGS , offsetof(struct thread_info , flags));DEFINE (TI_CPU , offsetof(struct thread_info , cpu)); -DEFINE (TI_SEGMENT , offsetof(struct thread_info , addr_limit));DEFINE (TI_PRE_COUNT , offsetof(struct thread_info , preempt_count));DEFINE (THREAD_SZ ,sizeof (struct thread_info ));/* THREAD_SZ_ALGN includes space for a stack frame. */
arch/parisc/lib/lusercopy.S +1 -17
@@ -27,21 +27,6 @@ #include <asm/errno.h> #include <linux/linkage.h> - /* - * get_sr gets the appropriate space value into - * sr1 for kernel/user space access, depending - * on the flag stored in the task structure. - */ - - .macro get_sr - mfctl %cr30,%r1 - ldw TI_SEGMENT(%r1),%r22 - mfsp %sr3,%r1 - or,<> %r22,%r0,%r0 - copy %r0,%r1 - mtsp %r1,%sr1 - .endm - /* * unsigned long lclear_user(void *to, unsigned long n) *
@@ -51,10 +36,9 @@ ENTRY_CFI(lclear_user) comib,=,n 0,%r25,$lclu_done - get_sr $lclu_loop: addib,<> -1,%r25,$lclu_loop -1: stbs,ma %r0,1(%sr1,%r26) +1: stbs,ma %r0,1(%sr3,%r26) $lclu_done: bv %r0(%r2)
--
2.31.1