diff options
author | Paul Fulghum <paulkf@microgate.com> | 2007-05-11 01:22:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 11:29:34 -0400 |
commit | 2acdb1694494eb6f17b44b2b3065879af32d0d46 (patch) | |
tree | c9d53e5082ac8e2e80aa228c95102661e0822978 /include/linux | |
parent | 4c64c30a5c96bb798cbd6097d4996205b5359fa2 (diff) |
synclink_gt: add compat_ioctl
Add support for 32 bit ioctl on 64 bit systems for synclink_gt
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Paul Fulghum <paulkf@microgate.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/Kbuild | 2 | ||||
-rw-r--r-- | include/linux/synclink.h | 24 |
2 files changed, 25 insertions, 1 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 94cc04a143f2..645b3b528150 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild | |||
@@ -140,7 +140,6 @@ header-y += snmp.h | |||
140 | header-y += sockios.h | 140 | header-y += sockios.h |
141 | header-y += som.h | 141 | header-y += som.h |
142 | header-y += sound.h | 142 | header-y += sound.h |
143 | header-y += synclink.h | ||
144 | header-y += taskstats.h | 143 | header-y += taskstats.h |
145 | header-y += telephony.h | 144 | header-y += telephony.h |
146 | header-y += termios.h | 145 | header-y += termios.h |
@@ -320,6 +319,7 @@ unifdef-y += sonypi.h | |||
320 | unifdef-y += soundcard.h | 319 | unifdef-y += soundcard.h |
321 | unifdef-y += stat.h | 320 | unifdef-y += stat.h |
322 | unifdef-y += stddef.h | 321 | unifdef-y += stddef.h |
322 | unifdef-y += synclink.h | ||
323 | unifdef-y += sysctl.h | 323 | unifdef-y += sysctl.h |
324 | unifdef-y += tcp.h | 324 | unifdef-y += tcp.h |
325 | unifdef-y += time.h | 325 | unifdef-y += time.h |
diff --git a/include/linux/synclink.h b/include/linux/synclink.h index c8b042667af1..5562fbf72095 100644 --- a/include/linux/synclink.h +++ b/include/linux/synclink.h | |||
@@ -291,4 +291,28 @@ struct gpio_desc { | |||
291 | #define MGSL_IOCGGPIO _IOR(MGSL_MAGIC_IOC,17,struct gpio_desc) | 291 | #define MGSL_IOCGGPIO _IOR(MGSL_MAGIC_IOC,17,struct gpio_desc) |
292 | #define MGSL_IOCWAITGPIO _IOWR(MGSL_MAGIC_IOC,18,struct gpio_desc) | 292 | #define MGSL_IOCWAITGPIO _IOWR(MGSL_MAGIC_IOC,18,struct gpio_desc) |
293 | 293 | ||
294 | #ifdef __KERNEL__ | ||
295 | /* provide 32 bit ioctl compatibility on 64 bit systems */ | ||
296 | #ifdef CONFIG_COMPAT | ||
297 | #include <linux/compat.h> | ||
298 | struct MGSL_PARAMS32 { | ||
299 | compat_ulong_t mode; | ||
300 | unsigned char loopback; | ||
301 | unsigned short flags; | ||
302 | unsigned char encoding; | ||
303 | compat_ulong_t clock_speed; | ||
304 | unsigned char addr_filter; | ||
305 | unsigned short crc_type; | ||
306 | unsigned char preamble_length; | ||
307 | unsigned char preamble; | ||
308 | compat_ulong_t data_rate; | ||
309 | unsigned char data_bits; | ||
310 | unsigned char stop_bits; | ||
311 | unsigned char parity; | ||
312 | }; | ||
313 | #define MGSL_IOCSPARAMS32 _IOW(MGSL_MAGIC_IOC,0,struct MGSL_PARAMS32) | ||
314 | #define MGSL_IOCGPARAMS32 _IOR(MGSL_MAGIC_IOC,1,struct MGSL_PARAMS32) | ||
315 | #endif | ||
316 | #endif | ||
317 | |||
294 | #endif /* _SYNCLINK_H_ */ | 318 | #endif /* _SYNCLINK_H_ */ |