Skip to content

L
linux
Commit c7145bdd authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge bk://kernel.bkbits.net/davem/sparc-2.5 

into home.transmeta.com:/home/torvalds/v2.5/linux
parents 9eaddc6e 477eaabe
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
include/asm-parisc/compat.h
View file @ c7145bdd
...@@ -112,7 +112,7 @@ typedef u32 compat_sigset_word; ...@@ -112,7 +112,7 @@ typedef u32 compat_sigset_word;
*/ */
typedef u32 compat_uptr_t; typedef u32 compat_uptr_t;
static inline void *compat_ptr(compat_ptr_t uptr) static inline void *compat_ptr(compat_uptr_t uptr)
{ {
return (void *)uptr; return (void *)uptr;
} }
......
include/asm-ppc64/compat.h
View file @ c7145bdd
...@@ -106,7 +106,7 @@ typedef u32 compat_sigset_word; ...@@ -106,7 +106,7 @@ typedef u32 compat_sigset_word;
*/ */
typedef u32 compat_uptr_t; typedef u32 compat_uptr_t;
static inline void *compat_ptr(compat_ptr_t uptr) static inline void *compat_ptr(compat_uptr_t uptr)
{ {
return (void *)uptr; return (void *)uptr;
} }
......
include/asm-s390x/compat.h
View file @ c7145bdd
...@@ -109,7 +109,7 @@ typedef u32 compat_sigset_word; ...@@ -109,7 +109,7 @@ typedef u32 compat_sigset_word;
*/ */
typedef u32 compat_uptr_t; typedef u32 compat_uptr_t;
static inline void *compat_ptr(compat_ptr_t uptr) static inline void *compat_ptr(compat_uptr_t uptr)
{ {
return (void *)(uptr & 0x7fffffffUL); return (void *)(uptr & 0x7fffffffUL);
} }
......
include/asm-x86_64/compat.h
View file @ c7145bdd
...@@ -115,7 +115,7 @@ typedef u32 compat_sigset_word; ...@@ -115,7 +115,7 @@ typedef u32 compat_sigset_word;
*/ */
typedef u32 compat_uptr_t; typedef u32 compat_uptr_t;
static inline void *compat_ptr(compat_ptr_t uptr) static inline void *compat_ptr(compat_uptr_t uptr)
{ {
return (void *)uptr; return (void *)uptr;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7