git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
include
/
asm-sh64
/
uaccess.h
diff --git
a/include/asm-sh64/uaccess.h
b/include/asm-sh64/uaccess.h
index
0207bae
..
f4936d8
100644
(file)
--- a/
include/asm-sh64/uaccess.h
+++ b/
include/asm-sh64/uaccess.h
@@
-60,11
+60,6
@@
#define access_ok(type,addr,size) (__range_ok(addr,size) == 0)
#define __access_ok(addr,size) (__range_ok(addr,size) == 0)
#define access_ok(type,addr,size) (__range_ok(addr,size) == 0)
#define __access_ok(addr,size) (__range_ok(addr,size) == 0)
-extern inline int verify_area(int type, const void __user * addr, unsigned long size)
-{
- return access_ok(type,addr,size) ? 0 : -EFAULT;
-}
-
/*
* Uh, these should become the main single-value transfer routines ...
* They automatically use the right size if we just have the right
/*
* Uh, these should become the main single-value transfer routines ...
* They automatically use the right size if we just have the right
@@
-261,6
+256,9
@@
if (__copy_from_user(to,from,n)) \
return retval; \
})
return retval; \
})
+#define __copy_to_user_inatomic __copy_to_user
+#define __copy_from_user_inatomic __copy_from_user
+
/* XXX: Not sure it works well..
should be such that: 4byte clear and the rest. */
extern __kernel_size_t __clear_user(void *addr, __kernel_size_t size);
/* XXX: Not sure it works well..
should be such that: 4byte clear and the rest. */
extern __kernel_size_t __clear_user(void *addr, __kernel_size_t size);
@@
-289,7
+287,7
@@
__sfu_res = __strncpy_from_user((unsigned long) (dest), __sfu_src, __sfu_count);
*/
extern long __strnlen_user(const char *__s, long __n);
*/
extern long __strnlen_user(const char *__s, long __n);
-
extern __inline__
long strnlen_user(const char *s, long n)
+
static inline
long strnlen_user(const char *s, long n)
{
if (!__addr_ok(s))
return 0;
{
if (!__addr_ok(s))
return 0;
@@
-310,6
+308,12
@@
struct exception_table_entry
sh64 at the moment). */
#define ARCH_KMALLOC_MINALIGN 8
sh64 at the moment). */
#define ARCH_KMALLOC_MINALIGN 8
+/*
+ * We want 8-byte alignment for the slab caches as well, otherwise we have
+ * the same BYTES_PER_WORD (sizeof(void *)) min align in kmem_cache_create().
+ */
+#define ARCH_SLAB_MINALIGN 8
+
/* Returns 0 if exception not found and fixup.unit otherwise. */
extern unsigned long search_exception_table(unsigned long addr);
extern const struct exception_table_entry *search_exception_tables (unsigned long addr);
/* Returns 0 if exception not found and fixup.unit otherwise. */
extern unsigned long search_exception_table(unsigned long addr);
extern const struct exception_table_entry *search_exception_tables (unsigned long addr);