Commit 272c1188 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Dave Jones

[PATCH] another fix for compat_ptr

This is the other part of the missing bits of the compat_ptr patch
pointed out to me by Andrew Morton and Dave Miller. This is just
the architectures I have permission to send you.  Dave has sent you
his own already.
parent 503be986
...@@ -114,7 +114,7 @@ typedef u32 compat_uptr_t; ...@@ -114,7 +114,7 @@ typedef u32 compat_uptr_t;
static inline void *compat_ptr(compat_uptr_t uptr) static inline void *compat_ptr(compat_uptr_t uptr)
{ {
return (void *)uptr; return (void *)(unsigned long)uptr;
} }
#endif /* _ASM_PARISC_COMPAT_H */ #endif /* _ASM_PARISC_COMPAT_H */
...@@ -108,7 +108,7 @@ typedef u32 compat_uptr_t; ...@@ -108,7 +108,7 @@ typedef u32 compat_uptr_t;
static inline void *compat_ptr(compat_uptr_t uptr) static inline void *compat_ptr(compat_uptr_t uptr)
{ {
return (void *)uptr; return (void *)(unsigned long)uptr;
} }
#endif /* _ASM_PPC64_COMPAT_H */ #endif /* _ASM_PPC64_COMPAT_H */
...@@ -111,7 +111,7 @@ typedef u32 compat_uptr_t; ...@@ -111,7 +111,7 @@ typedef u32 compat_uptr_t;
static inline void *compat_ptr(compat_uptr_t uptr) static inline void *compat_ptr(compat_uptr_t uptr)
{ {
return (void *)(uptr & 0x7fffffffUL); return (void *)(unsigned long)(uptr & 0x7fffffffUL);
} }
#endif /* _ASM_S390X_COMPAT_H */ #endif /* _ASM_S390X_COMPAT_H */
...@@ -117,7 +117,7 @@ typedef u32 compat_uptr_t; ...@@ -117,7 +117,7 @@ typedef u32 compat_uptr_t;
static inline void *compat_ptr(compat_uptr_t uptr) static inline void *compat_ptr(compat_uptr_t uptr)
{ {
return (void *)uptr; return (void *)(unsigned long)uptr;
} }
#endif /* _ASM_X86_64_COMPAT_H */ #endif /* _ASM_X86_64_COMPAT_H */
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