This patch the uaccess.h header to use the generic version from asm-generic. Kernel codesize decreases slightly because the generic version has some optimisations for small sized data exchanged with userspace.
Signed-off-by: Lars-Peter Clausen <[email protected]> --- arch/lm32/include/asm/processor.h | 2 +- arch/lm32/include/asm/thread_info.h | 4 +- arch/lm32/include/asm/uaccess.h | 207 +--------------------------------- 3 files changed, 11 insertions(+), 202 deletions(-) diff --git a/arch/lm32/include/asm/processor.h b/arch/lm32/include/asm/processor.h index 0cf882b..173b959 100644 --- a/arch/lm32/include/asm/processor.h +++ b/arch/lm32/include/asm/processor.h @@ -46,7 +46,7 @@ * User space process size: 3.75GB. This is hardcoded into a few places, * so don't change it unless you know what you are doing. */ -#define TASK_SIZE (0xF0000000UL) +#define TASK_SIZE (0xF0000000) /* * This decides where the kernel will search for a free chunk of vm diff --git a/arch/lm32/include/asm/thread_info.h b/arch/lm32/include/asm/thread_info.h index 011b908..8609aa5 100644 --- a/arch/lm32/include/asm/thread_info.h +++ b/arch/lm32/include/asm/thread_info.h @@ -20,7 +20,9 @@ #ifndef __ASSEMBLY__ -typedef unsigned long mm_segment_t; +typedef struct { + unsigned long seg; +} mm_segment_t; /* * low level task data. diff --git a/arch/lm32/include/asm/uaccess.h b/arch/lm32/include/asm/uaccess.h index 63722d4..f514437 100644 --- a/arch/lm32/include/asm/uaccess.h +++ b/arch/lm32/include/asm/uaccess.h @@ -1,209 +1,16 @@ -/* - * (C) Copyright 2007 - * Theobroma Systems <www.theobroma-systems.com> - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - #ifndef _LM32_ASM_UACCESS_H #define _LM32_ASM_UACCESS_H -/* - * User space memory access functions - */ -#include <linux/sched.h> -#include <linux/mm.h> -#include <linux/string.h> - -#include <asm/thread_info.h> -//#include <asm-generic/uaccess.h> -//#include <asm-generic/sections.h> - -#define VERIFY_READ 0 -#define VERIFY_WRITE 1 +extern unsigned long physical_memory_start; +extern unsigned long physical_memory_end; -#define access_ok(type,addr,size) _access_ok((unsigned long)(addr),(size)) - -static inline int _access_ok(unsigned long addr, unsigned long size) +static inline int __access_ok(unsigned long addr, unsigned long size) { - extern unsigned long physical_memory_start; - extern unsigned long physical_memory_end; - - return - (addr >= physical_memory_start) && - (addr < physical_memory_end) && - ((addr+size) <= physical_memory_end); + return (addr >= physical_memory_start) && + ((addr + size) <= physical_memory_end); } +#define __access_ok __access_ok -/* - * 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; -}; - -/* Returns 0 if exception not found and fixup otherwise. */ -extern unsigned long search_exception_table(unsigned long); - - -/* - * These are the main single-value transfer routines. They automatically - * use the right size if we just have the right pointer type. - */ - -#define put_user(x, ptr) \ -({ \ - int __pu_err = 0; \ - typeof(*(ptr)) __pu_val = (x); \ - switch (sizeof (*(ptr))) { \ - case 1: \ - case 2: \ - case 4: \ - case 8: \ - memcpy(ptr, &__pu_val, sizeof (*(ptr))); \ - break; \ - default: \ - __pu_err = __put_user_bad(); \ - break; \ - } \ - __pu_err; \ -}) -#define __put_user(x, ptr) put_user(x, ptr) - -extern int __put_user_bad(void); - -/* - * Tell gcc we read from memory instead of writing: this is because - * we do not write to any memory gcc knows about, so there are no - * aliasing issues. - */ - -#define __ptr(x) ((unsigned long *)(x)) - -#define get_user(x, ptr) \ -({ \ - int __gu_err = 0; \ - typeof(x) __gu_val = 0; \ - switch (sizeof(*(ptr))) { \ - case 1: \ - case 2: \ - case 4: \ - case 8: \ - memcpy((void *) &__gu_val, ptr, sizeof (*(ptr))); \ - break; \ - default: \ - __gu_val = 0; \ - __gu_err = __get_user_bad(); \ - break; \ - } \ - (x) = (typeof(*(ptr))) __gu_val; \ - __gu_err; \ -}) -#define __get_user(x, ptr) get_user(x, ptr) - -extern int __get_user_bad(void); - -#define copy_from_user(to, from, n) (access_ok(VERIFY_READ,(from),(n))?(memcpy((to),(from),(n)),0):-EFAULT) -#define copy_to_user(to, from, n) (access_ok(VERIFY_WRITE,(to),(n))?(memcpy((to),(from),(n)),0):-EFAULT) - -#define __copy_from_user(to, from, n) copy_from_user(to, from, n) -#define __copy_to_user(to, from, n) copy_to_user(to, from, n) -#define __copy_to_user_inatomic __copy_to_user -#define __copy_from_user_inatomic __copy_from_user - -#define copy_to_user_ret(to,from,n,retval) ({ if (copy_to_user(to,from,n)) return retval; }) - -#define copy_from_user_ret(to,from,n,retval) ({ if (copy_from_user(to,from,n)) return retval; }) - -/* - * Copy a null terminated string from userspace. - */ - -static inline long -strncpy_from_user(char *dst, const char *src, long count) -{ - char *tmp; - if( !access_ok(VERIFY_READ, src, count) ) - return -EFAULT; - strncpy(dst, src, count); - for (tmp = dst; *tmp && count > 0; tmp++, count--) - ; - return(tmp - dst); /* TODO DAVIDM should we count a NUL ? check getname */ -} - -#define __strncpy_from_user(dst,src,count) strncpy_from_user(dst,src,count) - -/* - * Return the size of a string (including the ending 0) - * - * Return 0 on exception, a value greater than N if too long - */ -static inline long strnlen_user(const char *src, long n) -{ - return(strlen(src) + 1); /* TODO DAVIDM make safer */ -} - -#define strlen_user(str) strnlen_user(str, 32767) - -/* - * Zero Userspace - */ - -static inline unsigned long -clear_user(void *to, unsigned long n) -{ - memset(to, 0, n); - return 0; -} - -#define __clear_user clear_user - -#define USER_DS (0x5) -#define KERNEL_DS (0xA) - -#define segment_eq(a,b) ((a) == (b)) - -static inline mm_segment_t get_fs(void) -{ - return current_thread_info()->addr_limit; -} - -static inline mm_segment_t get_ds(void) -{ - /* return the supervisor data space code */ - return KERNEL_DS; -} - -static inline void set_fs(mm_segment_t val) -{ - current_thread_info()->addr_limit = val; -} +#include <asm-generic/uaccess.h> #endif /* _LM32_ASM_UACCESS_H */ -- 1.7.2.3 _______________________________________________ http://lists.milkymist.org/listinfo.cgi/devel-milkymist.org IRC: #milkymist@Freenode Twitter: www.twitter.com/milkymistvj Ideas? http://milkymist.uservoice.com
