diff options
author | Christoph Hellwig <hch@lst.de> | 2006-01-09 23:52:11 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:01:32 -0500 |
commit | ec3cad96901373ad0e21611cfbcc372fe09df1f7 (patch) | |
tree | 4c4fff817b9e88fe3fd015382913944fe2d946d8 /arch/parisc | |
parent | 3a0f69d59ba41fbcad6a17b6e8aab02bf45e20ce (diff) |
[PATCH] move rtc compat ioctl handling to fs/compat_ioctl.c
This patch implements generic handling of RTC_IRQP_READ32, RTC_IRQP_SET32,
RTC_EPOCH_READ32 and RTC_EPOCH_SET32 in fs/compat_ioctl.c. It's based on the
x86_64 code which needed a little massaging to be endian-clean.
parisc used COMPAT_IOCTL or generic w_long handlers for these whichce is wrong
and can't work because the ioctls encode sizeof(unsigned long) in their ioctl
number. parisc also duplicated COMPAT_IOCTL entries for other rtc ioctls
which I remove in this patch, too.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Matthew Wilcox <matthew@wil.cx>
Acked-by: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/parisc')
-rw-r--r-- | arch/parisc/kernel/ioctl32.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/parisc/kernel/ioctl32.c b/arch/parisc/kernel/ioctl32.c index 4eada1bb27f0..805f31486cf9 100644 --- a/arch/parisc/kernel/ioctl32.c +++ b/arch/parisc/kernel/ioctl32.c | |||
@@ -36,25 +36,6 @@ HANDLE_IOCTL(SIOCGPPPSTATS, dev_ifsioc) | |||
36 | HANDLE_IOCTL(SIOCGPPPCSTATS, dev_ifsioc) | 36 | HANDLE_IOCTL(SIOCGPPPCSTATS, dev_ifsioc) |
37 | HANDLE_IOCTL(SIOCGPPPVER, dev_ifsioc) | 37 | HANDLE_IOCTL(SIOCGPPPVER, dev_ifsioc) |
38 | 38 | ||
39 | #if defined(CONFIG_GEN_RTC) | ||
40 | COMPATIBLE_IOCTL(RTC_AIE_ON) | ||
41 | COMPATIBLE_IOCTL(RTC_AIE_OFF) | ||
42 | COMPATIBLE_IOCTL(RTC_UIE_ON) | ||
43 | COMPATIBLE_IOCTL(RTC_UIE_OFF) | ||
44 | COMPATIBLE_IOCTL(RTC_PIE_ON) | ||
45 | COMPATIBLE_IOCTL(RTC_PIE_OFF) | ||
46 | COMPATIBLE_IOCTL(RTC_WIE_ON) | ||
47 | COMPATIBLE_IOCTL(RTC_WIE_OFF) | ||
48 | COMPATIBLE_IOCTL(RTC_ALM_SET) /* struct rtc_time only has ints */ | ||
49 | COMPATIBLE_IOCTL(RTC_ALM_READ) /* struct rtc_time only has ints */ | ||
50 | COMPATIBLE_IOCTL(RTC_RD_TIME) /* struct rtc_time only has ints */ | ||
51 | COMPATIBLE_IOCTL(RTC_SET_TIME) /* struct rtc_time only has ints */ | ||
52 | HANDLE_IOCTL(RTC_IRQP_READ, w_long) | ||
53 | COMPATIBLE_IOCTL(RTC_IRQP_SET) | ||
54 | HANDLE_IOCTL(RTC_EPOCH_READ, w_long) | ||
55 | COMPATIBLE_IOCTL(RTC_EPOCH_SET) | ||
56 | #endif | ||
57 | |||
58 | IOCTL_TABLE_END | 39 | IOCTL_TABLE_END |
59 | 40 | ||
60 | int ioctl_table_size = ARRAY_SIZE(ioctl_start); | 41 | int ioctl_table_size = ARRAY_SIZE(ioctl_start); |