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
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
sound
/
core
/
ioctl32
/
ioctl32.h
diff --git
a/sound/core/ioctl32/ioctl32.h
b/sound/core/ioctl32/ioctl32.h
index
e59d382
..
39887cc
100644
(file)
--- a/
sound/core/ioctl32/ioctl32.h
+++ b/
sound/core/ioctl32/ioctl32.h
@@
-26,19
+26,10
@@
#ifndef __ALSA_IOCTL32_H
#define __ALSA_IOCTL32_H
#ifndef __ALSA_IOCTL32_H
#define __ALSA_IOCTL32_H
-#ifndef A
-#ifdef CONFIG_PPC64
-#include <asm/ppc32.h>
-#else
-/* x86-64, sparc64 */
-#define A(__x) ((void *)(unsigned long)(__x))
-#endif
-#endif
-
-#define TO_PTR(x) A(x)
+#include <linux/compat.h>
#define COPY(x) (dst->x = src->x)
#define COPY(x) (dst->x = src->x)
-#define CPTR(x) (dst->x =
(typeof(dst->x))A
(src->x))
+#define CPTR(x) (dst->x =
compat_ptr
(src->x))
#define convert_from_32(type, dstp, srcp)\
{\
#define convert_from_32(type, dstp, srcp)\
{\
@@
-62,7
+53,7
@@
static int _snd_ioctl32_##type(unsigned int fd, unsigned int cmd, unsigned long
struct sndrv_##type data;\
mm_segment_t oldseg;\
int err;\
struct sndrv_##type data;\
mm_segment_t oldseg;\
int err;\
- if (copy_from_user(&data32, (void*)arg, sizeof(data32)))\
+ if (copy_from_user(&data32, (void
__user
*)arg, sizeof(data32)))\
return -EFAULT;\
memset(&data, 0, sizeof(data));\
convert_from_32(type, &data, &data32);\
return -EFAULT;\
memset(&data, 0, sizeof(data));\
convert_from_32(type, &data, &data32);\
@@
-74,7
+65,7
@@
static int _snd_ioctl32_##type(unsigned int fd, unsigned int cmd, unsigned long
return err;\
if (native_ctl & (_IOC_READ << _IOC_DIRSHIFT)) {\
convert_to_32(type, &data32, &data);\
return err;\
if (native_ctl & (_IOC_READ << _IOC_DIRSHIFT)) {\
convert_to_32(type, &data32, &data);\
- if (copy_to_user((void*)arg, &data32, sizeof(data32)))\
+ if (copy_to_user((void
__user
*)arg, &data32, sizeof(data32)))\
return -EFAULT;\
}\
return 0;\
return -EFAULT;\
}\
return 0;\
@@
-93,7
+84,7
@@
static int _snd_ioctl32_##type(unsigned int fd, unsigned int cmd, unsigned long
err = -ENOMEM; \
goto __end; \
}\
err = -ENOMEM; \
goto __end; \
}\
- if (copy_from_user(data32, (void*)arg, sizeof(*data32))) { \
+ if (copy_from_user(data32, (void
__user
*)arg, sizeof(*data32))) { \
err = -EFAULT; \
goto __end; \
}\
err = -EFAULT; \
goto __end; \
}\
@@
-108,7
+99,7
@@
static int _snd_ioctl32_##type(unsigned int fd, unsigned int cmd, unsigned long
err = 0;\
if (native_ctl & (_IOC_READ << _IOC_DIRSHIFT)) {\
convert_to_32(type, data32, data);\
err = 0;\
if (native_ctl & (_IOC_READ << _IOC_DIRSHIFT)) {\
convert_to_32(type, data32, data);\
- if (copy_to_user((void*)arg, data32, sizeof(*data32)))\
+ if (copy_to_user((void
__user
*)arg, data32, sizeof(*data32)))\
err = -EFAULT;\
}\
__end:\
err = -EFAULT;\
}\
__end:\