compat_ioctl: move WDIOC handling into wdt drivers

All watchdog drivers implement the same set of ioctl commands, and
fortunately all of them are compatible between 32-bit and 64-bit
architectures.

Modern drivers always go through drivers/watchdog/wdt.c as an abstraction
layer, but older ones implement their own file_operations on a character
device for this.

Move the handling from fs/compat_ioctl.c into the individual drivers.

Note that most of the legacy drivers will never be used on 64-bit
hardware, because they are for an old 32-bit SoC implementation, but
doing them all at once is safer than trying to guess which ones do
or do not need the compat_ioctl handling.

Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
index ba12dc14a3d1a008c43722bf167e7a54904a6ecb..8c0d324f657e1bba975fc6ec8fcacffd456e9425 100644 (file)
--- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
@@ -650,6 +650,7 @@ static const struct file_operations mpc52xx_wdt_fops = {
        .llseek         = no_llseek,
        .write          = mpc52xx_wdt_write,
        .unlocked_ioctl = mpc52xx_wdt_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = mpc52xx_wdt_open,
        .release        = mpc52xx_wdt_release,
 };

diff --git a/arch/um/drivers/harddog_kern.c b/arch/um/drivers/harddog_kern.c
index 000cb69ba0bc687ab538fc88b5dd0a7b5d32fe5b..e6d4f43deba82a77e20eaf15ea81639f0ddb37d1 100644 (file)
--- a/arch/um/drivers/harddog_kern.c
+++ b/arch/um/drivers/harddog_kern.c
@@ -165,6 +165,7 @@ static const struct file_operations harddog_fops = {
        .owner          = THIS_MODULE,
        .write          = harddog_write,
        .unlocked_ioctl = harddog_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = harddog_open,
        .release        = harddog_release,
        .llseek         = no_llseek,

diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index 74c6d1f341328d51e08b2b4bdf5a954e244833dd..55986e10a12443cb203e30e28dcfa873af73a75e 100644 (file)
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -893,6 +893,7 @@ static const struct file_operations ipmi_wdog_fops = {
        .poll    = ipmi_poll,
        .write   = ipmi_write,
        .unlocked_ioctl = ipmi_unlocked_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open    = ipmi_open,
        .release = ipmi_close,
        .fasync  = ipmi_fasync,

diff --git a/drivers/hwmon/fschmd.c b/drivers/hwmon/fschmd.c
index fa0c2f1fb443286ffbf20d3e2fcaac1aeeb4e1a4..4136643d8e0cde96d8792fa862395e0bece26aaf 100644 (file)
--- a/drivers/hwmon/fschmd.c
+++ b/drivers/hwmon/fschmd.c
@@ -954,6 +954,7 @@ static const struct file_operations watchdog_fops = {
        .release = watchdog_release,
        .write = watchdog_write,
        .unlocked_ioctl = watchdog_ioctl,
+       .compat_ioctl = compat_ptr_ioctl,
 };
 
 

diff --git a/drivers/hwmon/w83793.c b/drivers/hwmon/w83793.c
index 9df48b70c70c7381fbcba60119182a39edb2a2cd..55c5f86125e3da33e2b776533c9394f6035911c8 100644 (file)
--- a/drivers/hwmon/w83793.c
+++ b/drivers/hwmon/w83793.c
@@ -1458,6 +1458,7 @@ static const struct file_operations watchdog_fops = {
        .release = watchdog_close,
        .write = watchdog_write,
        .unlocked_ioctl = watchdog_ioctl,
+       .compat_ioctl = compat_ptr_ioctl,
 };
 
 /*

diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c
index 367497914c100992c7e5fe07a0c89a4546becd3f..6e96916c41ff0d490cedd31683edecf6b06ef345 100644 (file)
--- a/drivers/rtc/rtc-ds1374.c
+++ b/drivers/rtc/rtc-ds1374.c
@@ -586,6 +586,7 @@ static const struct file_operations ds1374_wdt_fops = {
        .owner                  = THIS_MODULE,
        .read                   = ds1374_wdt_read,
        .unlocked_ioctl         = ds1374_wdt_unlocked_ioctl,
+       .compat_ioctl           = compat_ptr_ioctl,
        .write                  = ds1374_wdt_write,
        .open                   = ds1374_wdt_open,
        .release                = ds1374_wdt_release,

diff --git a/drivers/rtc/rtc-m41t80.c b/drivers/rtc/rtc-m41t80.c
index 5f46f85f814b12d94c9e1cafc8ae9bc0b79e79cf..f9fa4f068de3fc914ba60cbcdfa361f591e74c8c 100644 (file)
--- a/drivers/rtc/rtc-m41t80.c
+++ b/drivers/rtc/rtc-m41t80.c
@@ -840,6 +840,7 @@ static const struct file_operations wdt_fops = {
        .owner  = THIS_MODULE,
        .read   = wdt_read,
        .unlocked_ioctl = wdt_unlocked_ioctl,
+       .compat_ioctl = compat_ptr_ioctl,
        .write  = wdt_write,
        .open   = wdt_open,
        .release = wdt_release,

diff --git a/drivers/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c
index 848db958411e387d004231b3247b18455acbcd2d..bc6f333565d3b669d83d842c6884b14d8b7f74ea 100644 (file)
--- a/drivers/watchdog/acquirewdt.c
+++ b/drivers/watchdog/acquirewdt.c
@@ -221,6 +221,7 @@ static const struct file_operations acq_fops = {
        .llseek         = no_llseek,
        .write          = acq_write,
        .unlocked_ioctl = acq_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = acq_open,
        .release        = acq_close,
 };

diff --git a/drivers/watchdog/advantechwdt.c b/drivers/watchdog/advantechwdt.c
index 0d02bb275b3dde0bd45c04c47700179ccd6713d8..0e4c18a2aa42b5c2ea05a643b1d12a818d8c4b68 100644 (file)
--- a/drivers/watchdog/advantechwdt.c
+++ b/drivers/watchdog/advantechwdt.c
@@ -220,6 +220,7 @@ static const struct file_operations advwdt_fops = {
        .llseek         = no_llseek,
        .write          = advwdt_write,
        .unlocked_ioctl = advwdt_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = advwdt_open,
        .release        = advwdt_close,
 };

diff --git a/drivers/watchdog/alim1535_wdt.c b/drivers/watchdog/alim1535_wdt.c
index c157dd3d92a3d69c8a2316e8c02aad49120b2027..42338c7d4540d0fb1a1c582d727726b2ca346372 100644 (file)
--- a/drivers/watchdog/alim1535_wdt.c
+++ b/drivers/watchdog/alim1535_wdt.c
@@ -362,6 +362,7 @@ static const struct file_operations ali_fops = {
        .llseek         =       no_llseek,
        .write          =       ali_write,
        .unlocked_ioctl =       ali_ioctl,
+       .compat_ioctl   =       compat_ptr_ioctl,
        .open           =       ali_open,
        .release        =       ali_release,
 };

diff --git a/drivers/watchdog/alim7101_wdt.c b/drivers/watchdog/alim7101_wdt.c
index c8e3ab056767d2cac34bc89b9aca36e62fb60620..5af0358f439008c964e36e282c8feff9621a85ac 100644 (file)
--- a/drivers/watchdog/alim7101_wdt.c
+++ b/drivers/watchdog/alim7101_wdt.c
@@ -294,6 +294,7 @@ static const struct file_operations wdt_fops = {
        .open           =       fop_open,
        .release        =       fop_close,
        .unlocked_ioctl =       fop_ioctl,
+       .compat_ioctl   =       compat_ptr_ioctl,
 };
 
 static struct miscdevice wdt_miscdev = {

diff --git a/drivers/watchdog/ar7_wdt.c b/drivers/watchdog/ar7_wdt.c
index 668a1c704f28063602b87a90713522d593be80d6..c087027ffd5d5da7fbf059017f24d98356806a92 100644 (file)
--- a/drivers/watchdog/ar7_wdt.c
+++ b/drivers/watchdog/ar7_wdt.c
@@ -250,6 +250,7 @@ static const struct file_operations ar7_wdt_fops = {
        .owner          = THIS_MODULE,
        .write          = ar7_wdt_write,
        .unlocked_ioctl = ar7_wdt_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = ar7_wdt_open,
        .release        = ar7_wdt_release,
        .llseek         = no_llseek,

diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c
index 907a4545dee64934e3f413928c01812a20204a54..6d751eb8191d6c8f3d2e398a5364432bc4d0e1b4 100644 (file)
--- a/drivers/watchdog/at91rm9200_wdt.c
+++ b/drivers/watchdog/at91rm9200_wdt.c
@@ -213,6 +213,7 @@ static const struct file_operations at91wdt_fops = {
        .owner          = THIS_MODULE,
        .llseek         = no_llseek,
        .unlocked_ioctl = at91_wdt_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = at91_wdt_open,
        .release        = at91_wdt_close,
        .write          = at91_wdt_write,

diff --git a/drivers/watchdog/ath79_wdt.c b/drivers/watchdog/ath79_wdt.c
index 75de664ef4b018a72d77fceb8934a48b94b2e88b..d6dff97c280be69853d6747b219f1bb9194e7b04 100644 (file)
--- a/drivers/watchdog/ath79_wdt.c
+++ b/drivers/watchdog/ath79_wdt.c
@@ -234,6 +234,7 @@ static const struct file_operations ath79_wdt_fops = {
        .llseek         = no_llseek,
        .write          = ath79_wdt_write,
        .unlocked_ioctl = ath79_wdt_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = ath79_wdt_open,
        .release        = ath79_wdt_release,
 };

diff --git a/drivers/watchdog/bcm63xx_wdt.c b/drivers/watchdog/bcm63xx_wdt.c
index e2af37c9a266894f928359feaf1981966a8188ed..8a043b52aa2f9786ac3bb0f9615dfe363bfa050e 100644 (file)
--- a/drivers/watchdog/bcm63xx_wdt.c
+++ b/drivers/watchdog/bcm63xx_wdt.c
@@ -221,6 +221,7 @@ static const struct file_operations bcm63xx_wdt_fops = {
        .llseek         = no_llseek,
        .write          = bcm63xx_wdt_write,
        .unlocked_ioctl = bcm63xx_wdt_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = bcm63xx_wdt_open,
        .release        = bcm63xx_wdt_release,
 };

diff --git a/drivers/watchdog/cpu5wdt.c b/drivers/watchdog/cpu5wdt.c
index d6d53014cb689ba11694377469916db34ce887c0..9867a3a936df2a6cd663e32fbef4552fcc015cd1 100644 (file)
--- a/drivers/watchdog/cpu5wdt.c
+++ b/drivers/watchdog/cpu5wdt.c
@@ -187,6 +187,7 @@ static const struct file_operations cpu5wdt_fops = {
        .owner          = THIS_MODULE,
        .llseek         = no_llseek,
        .unlocked_ioctl = cpu5wdt_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = cpu5wdt_open,
        .write          = cpu5wdt_write,
        .release        = cpu5wdt_release,

diff --git a/drivers/watchdog/eurotechwdt.c b/drivers/watchdog/eurotechwdt.c
index 3a83a48abcae73f9ee48903ae4027481f46b5ade..f5ffa7be066e36f75703954b158ff00277601e1f 100644 (file)
--- a/drivers/watchdog/eurotechwdt.c
+++ b/drivers/watchdog/eurotechwdt.c
@@ -371,6 +371,7 @@ static const struct file_operations eurwdt_fops = {
        .llseek         = no_llseek,
        .write          = eurwdt_write,
        .unlocked_ioctl = eurwdt_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = eurwdt_open,
        .release        = eurwdt_release,
 };

diff --git a/drivers/watchdog/f71808e_wdt.c b/drivers/watchdog/f71808e_wdt.c
index e46104c2fd94ec98319afea4ceae025fda7241c0..a3c44d75d80eb0a65baf4d254e93954daa4a2f16 100644 (file)
--- a/drivers/watchdog/f71808e_wdt.c
+++ b/drivers/watchdog/f71808e_wdt.c
@@ -669,6 +669,7 @@ static const struct file_operations watchdog_fops = {
        .release        = watchdog_release,
        .write          = watchdog_write,
        .unlocked_ioctl = watchdog_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
 };
 
 static struct miscdevice watchdog_miscdev = {

diff --git a/drivers/watchdog/gef_wdt.c b/drivers/watchdog/gef_wdt.c
index 7d5f56994f090c40974b55bb8347348ecdc6ff25..f6541d1b65e3ad325fc638f4aa8cee19ca338d43 100644 (file)
--- a/drivers/watchdog/gef_wdt.c
+++ b/drivers/watchdog/gef_wdt.c
@@ -248,6 +248,7 @@ static const struct file_operations gef_wdt_fops = {
        .llseek = no_llseek,
        .write = gef_wdt_write,
        .unlocked_ioctl = gef_wdt_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open = gef_wdt_open,
        .release = gef_wdt_release,
 };

diff --git a/drivers/watchdog/geodewdt.c b/drivers/watchdog/geodewdt.c
index 8d105d98908e1ab50076d4bb23e78bef6599ecae..9914a4283cb2a5582e5f1b00426e6ff708ba17ad 100644 (file)
--- a/drivers/watchdog/geodewdt.c
+++ b/drivers/watchdog/geodewdt.c
@@ -201,6 +201,7 @@ static const struct file_operations geodewdt_fops = {
        .llseek         = no_llseek,
        .write          = geodewdt_write,
        .unlocked_ioctl = geodewdt_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = geodewdt_open,
        .release        = geodewdt_release,
 };

diff --git a/drivers/watchdog/ib700wdt.c b/drivers/watchdog/ib700wdt.c
index 92fd7f33bc4d50cbe73d0c301710321b2d90f0bd..2b65ea9451d12bdc1147ba09fbcbdbce730f6479 100644 (file)
--- a/drivers/watchdog/ib700wdt.c
+++ b/drivers/watchdog/ib700wdt.c
@@ -259,6 +259,7 @@ static const struct file_operations ibwdt_fops = {
        .llseek         = no_llseek,
        .write          = ibwdt_write,
        .unlocked_ioctl = ibwdt_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = ibwdt_open,
        .release        = ibwdt_close,
 };

diff --git a/drivers/watchdog/ibmasr.c b/drivers/watchdog/ibmasr.c
index 897f7eda9e6ad075024b578e2106ac0d49cf73dd..4a22fe15208630b0bcaa45f1ed4d9872270733cf 100644 (file)
--- a/drivers/watchdog/ibmasr.c
+++ b/drivers/watchdog/ibmasr.c
@@ -344,6 +344,7 @@ static const struct file_operations asr_fops = {
        .llseek =               no_llseek,
        .write =                asr_write,
        .unlocked_ioctl =       asr_ioctl,
+       .compat_ioctl =         compat_ptr_ioctl,
        .open =                 asr_open,
        .release =              asr_release,
 };

diff --git a/drivers/watchdog/indydog.c b/drivers/watchdog/indydog.c
index 550358528084a1bb44928fcc9b95e3d17e2fbd5a..9857bb74a723fc648ee07b895baf126eda966880 100644 (file)
--- a/drivers/watchdog/indydog.c
+++ b/drivers/watchdog/indydog.c
@@ -152,6 +152,7 @@ static const struct file_operations indydog_fops = {
        .llseek         = no_llseek,
        .write          = indydog_write,
        .unlocked_ioctl = indydog_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = indydog_open,
        .release        = indydog_release,
 };

diff --git a/drivers/watchdog/intel_scu_watchdog.c b/drivers/watchdog/intel_scu_watchdog.c
index 1c85103b750be08e13f217692c4588b8ecf33c19..6ad5bf3451ec0416c2b26e1fc85f1a5ffdac2ebf 100644 (file)
--- a/drivers/watchdog/intel_scu_watchdog.c
+++ b/drivers/watchdog/intel_scu_watchdog.c
@@ -412,6 +412,7 @@ static const struct file_operations intel_scu_fops = {
        .llseek         = no_llseek,
        .write          = intel_scu_write,
        .unlocked_ioctl = intel_scu_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = intel_scu_open,
        .release        = intel_scu_release,
 };

diff --git a/drivers/watchdog/iop_wdt.c b/drivers/watchdog/iop_wdt.c
index a9ccdb9a91598b718ff29dbd46b5d7a1feef2787..6bf68d4750de3efd8027fc65b9b2f909d20082b6 100644 (file)
--- a/drivers/watchdog/iop_wdt.c
+++ b/drivers/watchdog/iop_wdt.c
@@ -202,6 +202,7 @@ static const struct file_operations iop_wdt_fops = {
        .llseek = no_llseek,
        .write = iop_wdt_write,
        .unlocked_ioctl = iop_wdt_ioctl,
+       .compat_ioctl = compat_ptr_ioctl,
        .open = iop_wdt_open,
        .release = iop_wdt_release,
 };

diff --git a/drivers/watchdog/it8712f_wdt.c b/drivers/watchdog/it8712f_wdt.c
index 2fe1a3c499ed49851aca5495dce32f375468fbd6..2fed40d1400783a014b777e75f0e81fa238eb050 100644 (file)
--- a/drivers/watchdog/it8712f_wdt.c
+++ b/drivers/watchdog/it8712f_wdt.c
@@ -345,6 +345,7 @@ static const struct file_operations it8712f_wdt_fops = {
        .llseek = no_llseek,
        .write = it8712f_wdt_write,
        .unlocked_ioctl = it8712f_wdt_ioctl,
+       .compat_ioctl = compat_ptr_ioctl,
        .open = it8712f_wdt_open,
        .release = it8712f_wdt_release,
 };

diff --git a/drivers/watchdog/ixp4xx_wdt.c b/drivers/watchdog/ixp4xx_wdt.c
index 9067998759e36214dbd8beb8f8eefe231b69deb5..09886616fd212c92338577d0aaf631fb080a3bfe 100644 (file)
--- a/drivers/watchdog/ixp4xx_wdt.c
+++ b/drivers/watchdog/ixp4xx_wdt.c
@@ -163,6 +163,7 @@ static const struct file_operations ixp4xx_wdt_fops = {
        .llseek         = no_llseek,
        .write          = ixp4xx_wdt_write,
        .unlocked_ioctl = ixp4xx_wdt_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = ixp4xx_wdt_open,
        .release        = ixp4xx_wdt_release,
 };

diff --git a/drivers/watchdog/m54xx_wdt.c b/drivers/watchdog/m54xx_wdt.c
index 752d03620f0a3e0e24e23b7e064299d7c04e294c..22f335e1e16451f547b4de6eded846ae51fd8b11 100644 (file)
--- a/drivers/watchdog/m54xx_wdt.c
+++ b/drivers/watchdog/m54xx_wdt.c
@@ -183,6 +183,7 @@ static const struct file_operations m54xx_wdt_fops = {
        .llseek         = no_llseek,
        .write          = m54xx_wdt_write,
        .unlocked_ioctl = m54xx_wdt_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = m54xx_wdt_open,
        .release        = m54xx_wdt_release,
 };

diff --git a/drivers/watchdog/machzwd.c b/drivers/watchdog/machzwd.c
index cef2baf59dda4f5daffad3eda090f26b30144429..80ff94688487358a6bd410fc7588becc9a109dd6 100644 (file)
--- a/drivers/watchdog/machzwd.c
+++ b/drivers/watchdog/machzwd.c
@@ -361,6 +361,7 @@ static const struct file_operations zf_fops = {
        .llseek         = no_llseek,
        .write          = zf_write,
        .unlocked_ioctl = zf_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = zf_open,
        .release        = zf_close,
 };

diff --git a/drivers/watchdog/mixcomwd.c b/drivers/watchdog/mixcomwd.c
index a86faa5000f1429d2055e47d87a0280db5e1c930..d387bad377c45fcf70fde0f688a8c830ca415dcf 100644 (file)
--- a/drivers/watchdog/mixcomwd.c
+++ b/drivers/watchdog/mixcomwd.c
@@ -227,6 +227,7 @@ static const struct file_operations mixcomwd_fops = {
        .llseek         = no_llseek,
        .write          = mixcomwd_write,
        .unlocked_ioctl = mixcomwd_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = mixcomwd_open,
        .release        = mixcomwd_release,
 };

diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c
index 25a92857b2173f908d4c953e52be1f98d36431c9..8aa1cb4a295f1ca9a59adb8e106a2cfe2a9aecfb 100644 (file)
--- a/drivers/watchdog/mtx-1_wdt.c
+++ b/drivers/watchdog/mtx-1_wdt.c
@@ -181,6 +181,7 @@ static const struct file_operations mtx1_wdt_fops = {
        .owner          = THIS_MODULE,
        .llseek         = no_llseek,
        .unlocked_ioctl = mtx1_wdt_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = mtx1_wdt_open,
        .write          = mtx1_wdt_write,
        .release        = mtx1_wdt_release,

diff --git a/drivers/watchdog/mv64x60_wdt.c b/drivers/watchdog/mv64x60_wdt.c
index 74bf7144a9704943180d9b8aeaf221f5884e1213..0bc72dd69b70371f8d90869df4e98e6df619c995 100644 (file)
--- a/drivers/watchdog/mv64x60_wdt.c
+++ b/drivers/watchdog/mv64x60_wdt.c
@@ -241,6 +241,7 @@ static const struct file_operations mv64x60_wdt_fops = {
        .llseek = no_llseek,
        .write = mv64x60_wdt_write,
        .unlocked_ioctl = mv64x60_wdt_ioctl,
+       .compat_ioctl = compat_ptr_ioctl,
        .open = mv64x60_wdt_open,
        .release = mv64x60_wdt_release,
 };

diff --git a/drivers/watchdog/nv_tco.c b/drivers/watchdog/nv_tco.c
index 5f0082e300bdc1f333f50fc696a0c1db74c9767f..d7a560e348d5fe735da0185a4ded4739837b9ce3 100644 (file)
--- a/drivers/watchdog/nv_tco.c
+++ b/drivers/watchdog/nv_tco.c
@@ -267,6 +267,7 @@ static const struct file_operations nv_tco_fops = {
        .llseek =               no_llseek,
        .write =                nv_tco_write,
        .unlocked_ioctl =       nv_tco_ioctl,
+       .compat_ioctl =         compat_ptr_ioctl,
        .open =                 nv_tco_open,
        .release =              nv_tco_release,
 };

diff --git a/drivers/watchdog/pc87413_wdt.c b/drivers/watchdog/pc87413_wdt.c
index 2af1a8b3f97338cc18110306a64fda5a3bf9d667..73fbfc99083ba80d64c1bef8f8cab195d893e264 100644 (file)
--- a/drivers/watchdog/pc87413_wdt.c
+++ b/drivers/watchdog/pc87413_wdt.c
@@ -473,6 +473,7 @@ static const struct file_operations pc87413_fops = {
        .llseek         = no_llseek,
        .write          = pc87413_write,
        .unlocked_ioctl = pc87413_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = pc87413_open,
        .release        = pc87413_release,
 };

diff --git a/drivers/watchdog/pcwd.c b/drivers/watchdog/pcwd.c
index c3c93e00b32050947d6bd0a592915ba2a8fb4f03..7a0587fdc52c3ae53383902ca489a5fe5a0b3068 100644 (file)
--- a/drivers/watchdog/pcwd.c
+++ b/drivers/watchdog/pcwd.c
@@ -752,6 +752,7 @@ static const struct file_operations pcwd_fops = {
        .llseek         = no_llseek,
        .write          = pcwd_write,
        .unlocked_ioctl = pcwd_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = pcwd_open,
        .release        = pcwd_close,
 };

diff --git a/drivers/watchdog/pcwd_pci.c b/drivers/watchdog/pcwd_pci.c
index e30c1f762045115de958caab7540d06bdb114af0..81508a42a90c25d934c2f541cd7d2e5e625068e9 100644 (file)
--- a/drivers/watchdog/pcwd_pci.c
+++ b/drivers/watchdog/pcwd_pci.c
@@ -646,6 +646,7 @@ static const struct file_operations pcipcwd_fops = {
        .llseek =       no_llseek,
        .write =        pcipcwd_write,
        .unlocked_ioctl = pcipcwd_ioctl,
+       .compat_ioctl = compat_ptr_ioctl,
        .open =         pcipcwd_open,
        .release =      pcipcwd_release,
 };

diff --git a/drivers/watchdog/pcwd_usb.c b/drivers/watchdog/pcwd_usb.c
index 6727f8ab2d182dbbe243c57bcb2fd5b063dbe398..2f44af1831d00cd1bfc0f3e450011e5763c3fed4 100644 (file)
--- a/drivers/watchdog/pcwd_usb.c
+++ b/drivers/watchdog/pcwd_usb.c
@@ -550,6 +550,7 @@ static const struct file_operations usb_pcwd_fops = {
        .llseek =       no_llseek,
        .write =        usb_pcwd_write,
        .unlocked_ioctl = usb_pcwd_ioctl,
+       .compat_ioctl = compat_ptr_ioctl,
        .open =         usb_pcwd_open,
        .release =      usb_pcwd_release,
 };

diff --git a/drivers/watchdog/pika_wdt.c b/drivers/watchdog/pika_wdt.c
index 205c3c68fca1f22b9ffd1eea169a45546faba62d..a98abd0d31467b9b12db6a8669058f05706b3ee5 100644 (file)
--- a/drivers/watchdog/pika_wdt.c
+++ b/drivers/watchdog/pika_wdt.c
@@ -214,6 +214,7 @@ static const struct file_operations pikawdt_fops = {
        .release        = pikawdt_release,
        .write          = pikawdt_write,
        .unlocked_ioctl = pikawdt_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
 };
 
 static struct miscdevice pikawdt_miscdev = {

diff --git a/drivers/watchdog/pnx833x_wdt.c b/drivers/watchdog/pnx833x_wdt.c
index aa53babf2babc24290b35e54c844a1022f9a847f..4097d076aab879aaad61c585398b41fdab9196f3 100644 (file)
--- a/drivers/watchdog/pnx833x_wdt.c
+++ b/drivers/watchdog/pnx833x_wdt.c
@@ -215,6 +215,7 @@ static const struct file_operations pnx833x_wdt_fops = {
        .llseek         = no_llseek,
        .write          = pnx833x_wdt_write,
        .unlocked_ioctl = pnx833x_wdt_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = pnx833x_wdt_open,
        .release        = pnx833x_wdt_release,
 };

diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c
index a8a4b3a41a9066fb742c94530479bd7d51c4d260..1dfede0abf18e93a46a8965b00f1e236ae838823 100644 (file)
--- a/drivers/watchdog/rc32434_wdt.c
+++ b/drivers/watchdog/rc32434_wdt.c
@@ -245,6 +245,7 @@ static const struct file_operations rc32434_wdt_fops = {
        .llseek         = no_llseek,
        .write          = rc32434_wdt_write,
        .unlocked_ioctl = rc32434_wdt_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = rc32434_wdt_open,
        .release        = rc32434_wdt_release,
 };

diff --git a/drivers/watchdog/rdc321x_wdt.c b/drivers/watchdog/rdc321x_wdt.c
index 2e608ae6cbc78d752caefc4087d0b6a7e213ba82..57187efeb86f1104d1cb0fe3283f2cb389700e7a 100644 (file)
--- a/drivers/watchdog/rdc321x_wdt.c
+++ b/drivers/watchdog/rdc321x_wdt.c
@@ -199,6 +199,7 @@ static const struct file_operations rdc321x_wdt_fops = {
        .owner          = THIS_MODULE,
        .llseek         = no_llseek,
        .unlocked_ioctl = rdc321x_wdt_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = rdc321x_wdt_open,
        .write          = rdc321x_wdt_write,
        .release        = rdc321x_wdt_release,

diff --git a/drivers/watchdog/riowd.c b/drivers/watchdog/riowd.c
index b35f7be20c00d08b12b7ef234d6c5f2214717aca..dc3c06a92f934357be8cdde34678a148053bdac2 100644 (file)
--- a/drivers/watchdog/riowd.c
+++ b/drivers/watchdog/riowd.c
@@ -163,6 +163,7 @@ static const struct file_operations riowd_fops = {
        .owner =                THIS_MODULE,
        .llseek =               no_llseek,
        .unlocked_ioctl =       riowd_ioctl,
+       .compat_ioctl   =       compat_ptr_ioctl,
        .open =                 riowd_open,
        .write =                riowd_write,
        .release =              riowd_release,

diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c
index cbd8c957182fd808ea6078a23bf26d3ddd9ab0e1..9b93be00109fe251e1a12d940bf3e4aa4fd3630a 100644 (file)
--- a/drivers/watchdog/sa1100_wdt.c
+++ b/drivers/watchdog/sa1100_wdt.c
@@ -141,6 +141,7 @@ static const struct file_operations sa1100dog_fops = {
        .llseek         = no_llseek,
        .write          = sa1100dog_write,
        .unlocked_ioctl = sa1100dog_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = sa1100dog_open,
        .release        = sa1100dog_release,
 };

diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c
index 202fc8d8ca5fa573385279ca14c6d7557784c71c..da2dad00d473c44101e9ffc88e1ab4b4672e9134 100644 (file)
--- a/drivers/watchdog/sb_wdog.c
+++ b/drivers/watchdog/sb_wdog.c
@@ -237,6 +237,7 @@ static const struct file_operations sbwdog_fops = {
        .llseek         = no_llseek,
        .write          = sbwdog_write,
        .unlocked_ioctl = sbwdog_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = sbwdog_open,
        .release        = sbwdog_release,
 };

diff --git a/drivers/watchdog/sbc60xxwdt.c b/drivers/watchdog/sbc60xxwdt.c
index c3151642694c99e86ff35f80f500a2c0b4128e43..f2cbe6d880a8ab2ad019aaf38865adc9b48f7b85 100644 (file)
--- a/drivers/watchdog/sbc60xxwdt.c
+++ b/drivers/watchdog/sbc60xxwdt.c
@@ -280,6 +280,7 @@ static const struct file_operations wdt_fops = {
        .open           = fop_open,
        .release        = fop_close,
        .unlocked_ioctl = fop_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
 };
 
 static struct miscdevice wdt_miscdev = {

diff --git a/drivers/watchdog/sbc7240_wdt.c b/drivers/watchdog/sbc7240_wdt.c
index 12cdee7d5069ccdca795de93f8e64e9b37530601..0bf583b76e6b358c013b0972383fc819a790af23 100644 (file)
--- a/drivers/watchdog/sbc7240_wdt.c
+++ b/drivers/watchdog/sbc7240_wdt.c
@@ -211,6 +211,7 @@ static const struct file_operations wdt_fops = {
        .open = fop_open,
        .release = fop_close,
        .unlocked_ioctl = fop_ioctl,
+       .compat_ioctl = compat_ptr_ioctl,
 };
 
 static struct miscdevice wdt_miscdev = {

diff --git a/drivers/watchdog/sbc_epx_c3.c b/drivers/watchdog/sbc_epx_c3.c
index 86828c28843f1d196719a273b0aca016df321c74..5e3a9ddb952e2cfd1526a8ae82b27ba14368bbd2 100644 (file)
--- a/drivers/watchdog/sbc_epx_c3.c
+++ b/drivers/watchdog/sbc_epx_c3.c
@@ -156,6 +156,7 @@ static const struct file_operations epx_c3_fops = {
        .llseek         = no_llseek,
        .write          = epx_c3_write,
        .unlocked_ioctl = epx_c3_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = epx_c3_open,
        .release        = epx_c3_release,
 };

diff --git a/drivers/watchdog/sbc_fitpc2_wdt.c b/drivers/watchdog/sbc_fitpc2_wdt.c
index 3822a60a8d2b82bfd36d3b67aa77ef69e065880e..1b20b33879c47952bbd7b08ad60d2974e5368476 100644 (file)
--- a/drivers/watchdog/sbc_fitpc2_wdt.c
+++ b/drivers/watchdog/sbc_fitpc2_wdt.c
@@ -186,6 +186,7 @@ static const struct file_operations fitpc2_wdt_fops = {
        .llseek         = no_llseek,
        .write          = fitpc2_wdt_write,
        .unlocked_ioctl = fitpc2_wdt_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = fitpc2_wdt_open,
        .release        = fitpc2_wdt_release,
 };

diff --git a/drivers/watchdog/sc1200wdt.c b/drivers/watchdog/sc1200wdt.c
index 960385a766b39e9e56572569af50396621965e26..9673eb12dacd06d5577e312f3dc8f46aa5188ddc 100644 (file)
--- a/drivers/watchdog/sc1200wdt.c
+++ b/drivers/watchdog/sc1200wdt.c
@@ -307,6 +307,7 @@ static const struct file_operations sc1200wdt_fops = {
        .llseek         = no_llseek,
        .write          = sc1200wdt_write,
        .unlocked_ioctl = sc1200wdt_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = sc1200wdt_open,
        .release        = sc1200wdt_release,
 };

diff --git a/drivers/watchdog/sc520_wdt.c b/drivers/watchdog/sc520_wdt.c
index a612128c5f808ae7bb9794e49f4cc863009ac50d..fbe79bcc9297b4c985afff9416c52a4a37a05c01 100644 (file)
--- a/drivers/watchdog/sc520_wdt.c
+++ b/drivers/watchdog/sc520_wdt.c
@@ -336,6 +336,7 @@ static const struct file_operations wdt_fops = {
        .open           = fop_open,
        .release        = fop_close,
        .unlocked_ioctl = fop_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
 };
 
 static struct miscdevice wdt_miscdev = {

diff --git a/drivers/watchdog/sch311x_wdt.c b/drivers/watchdog/sch311x_wdt.c
index 3612f1df381b677a50e0bb05f05790a7f64172d1..83949a385f62d6398b3290b39d58af247dcc2f18 100644 (file)
--- a/drivers/watchdog/sch311x_wdt.c
+++ b/drivers/watchdog/sch311x_wdt.c
@@ -337,6 +337,7 @@ static const struct file_operations sch311x_wdt_fops = {
        .llseek         = no_llseek,
        .write          = sch311x_wdt_write,
        .unlocked_ioctl = sch311x_wdt_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = sch311x_wdt_open,
        .release        = sch311x_wdt_close,
 };

diff --git a/drivers/watchdog/scx200_wdt.c b/drivers/watchdog/scx200_wdt.c
index 46268309ee9b86825eb5cc1a6155e4ca08430de1..c94098acb78f3c30f9d80144dbc6f86769a05305 100644 (file)
--- a/drivers/watchdog/scx200_wdt.c
+++ b/drivers/watchdog/scx200_wdt.c
@@ -201,6 +201,7 @@ static const struct file_operations scx200_wdt_fops = {
        .llseek = no_llseek,
        .write = scx200_wdt_write,
        .unlocked_ioctl = scx200_wdt_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open = scx200_wdt_open,
        .release = scx200_wdt_release,
 };

diff --git a/drivers/watchdog/smsc37b787_wdt.c b/drivers/watchdog/smsc37b787_wdt.c
index f5713030d0f74a26570c6a0f8ea2ea81812bc7bc..43de56acd767f26795d6adfba41a3f242baff7de 100644 (file)
--- a/drivers/watchdog/smsc37b787_wdt.c
+++ b/drivers/watchdog/smsc37b787_wdt.c
@@ -505,6 +505,7 @@ static const struct file_operations wb_smsc_wdt_fops = {
        .llseek         = no_llseek,
        .write          = wb_smsc_wdt_write,
        .unlocked_ioctl = wb_smsc_wdt_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = wb_smsc_wdt_open,
        .release        = wb_smsc_wdt_release,
 };

diff --git a/drivers/watchdog/w83877f_wdt.c b/drivers/watchdog/w83877f_wdt.c
index 6eb5185d6ea684d1debe40a6f4f45b91332924a2..6b3b667e6f23c8c3888e0e05390500c6135eb633 100644 (file)
--- a/drivers/watchdog/w83877f_wdt.c
+++ b/drivers/watchdog/w83877f_wdt.c
@@ -304,6 +304,7 @@ static const struct file_operations wdt_fops = {
        .open           = fop_open,
        .release        = fop_close,
        .unlocked_ioctl = fop_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
 };
 
 static struct miscdevice wdt_miscdev = {

diff --git a/drivers/watchdog/w83977f_wdt.c b/drivers/watchdog/w83977f_wdt.c
index 16e9cbe72accf39a13902705196c3aac4c8be642..5212e68c6b016593a0b94180e7af4fc1f877c093 100644 (file)
--- a/drivers/watchdog/w83977f_wdt.c
+++ b/drivers/watchdog/w83977f_wdt.c
@@ -446,6 +446,7 @@ static const struct file_operations wdt_fops = {
        .llseek         = no_llseek,
        .write          = wdt_write,
        .unlocked_ioctl = wdt_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = wdt_open,
        .release        = wdt_release,
 };

diff --git a/drivers/watchdog/wafer5823wdt.c b/drivers/watchdog/wafer5823wdt.c
index 6d2071a0590d6eebb168dfa369d2a185ca4ca67b..a6925847f76f8a3cfa7838ae81747bb8fd576303 100644 (file)
--- a/drivers/watchdog/wafer5823wdt.c
+++ b/drivers/watchdog/wafer5823wdt.c
@@ -230,6 +230,7 @@ static const struct file_operations wafwdt_fops = {
        .llseek         = no_llseek,
        .write          = wafwdt_write,
        .unlocked_ioctl = wafwdt_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = wafwdt_open,
        .release        = wafwdt_close,
 };

diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c
index dbd2ad4c929481fa95fcbbb03a713c81704a5305..3858094ca6ba05a5a635586098aab3cea797e97c 100644 (file)
--- a/drivers/watchdog/watchdog_dev.c
+++ b/drivers/watchdog/watchdog_dev.c
@@ -933,6 +933,7 @@ static const struct file_operations watchdog_fops = {
        .owner          = THIS_MODULE,
        .write          = watchdog_write,
        .unlocked_ioctl = watchdog_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = watchdog_open,
        .release        = watchdog_release,
 };

diff --git a/drivers/watchdog/wdrtas.c b/drivers/watchdog/wdrtas.c
index 6ad7edb4a712b076a98987fc20bb1bcca828174f..184a06a74f83a225c3289a53f2d98197523718f4 100644 (file)
--- a/drivers/watchdog/wdrtas.c
+++ b/drivers/watchdog/wdrtas.c
@@ -472,6 +472,7 @@ static const struct file_operations wdrtas_fops = {
        .llseek         = no_llseek,
        .write          = wdrtas_write,
        .unlocked_ioctl = wdrtas_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = wdrtas_open,
        .release        = wdrtas_close,
 };

diff --git a/drivers/watchdog/wdt.c b/drivers/watchdog/wdt.c
index 7d278b37e083d2bb4b8d5f0401593554e0e94a5b..f9054cb0f8e242553babfc0003fb9974171ea1cf 100644 (file)
--- a/drivers/watchdog/wdt.c
+++ b/drivers/watchdog/wdt.c
@@ -523,6 +523,7 @@ static const struct file_operations wdt_fops = {
        .llseek         = no_llseek,
        .write          = wdt_write,
        .unlocked_ioctl = wdt_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = wdt_open,
        .release        = wdt_release,
 };

diff --git a/drivers/watchdog/wdt285.c b/drivers/watchdog/wdt285.c
index eb729d704836b656ccb00972c878cd036f68b8d6..e60993d0767ef57a649b64c0443c1ef380f94e2e 100644 (file)
--- a/drivers/watchdog/wdt285.c
+++ b/drivers/watchdog/wdt285.c
@@ -181,6 +181,7 @@ static const struct file_operations watchdog_fops = {
        .llseek         = no_llseek,
        .write          = watchdog_write,
        .unlocked_ioctl = watchdog_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = watchdog_open,
        .release        = watchdog_release,
 };

diff --git a/drivers/watchdog/wdt977.c b/drivers/watchdog/wdt977.c
index 5c52c73e183993c6ce7713362bbcfd331e12d76a..066a4fb4d75ba58a1e93183e5481a557e1266e27 100644 (file)
--- a/drivers/watchdog/wdt977.c
+++ b/drivers/watchdog/wdt977.c
@@ -422,6 +422,7 @@ static const struct file_operations wdt977_fops = {
        .llseek         = no_llseek,
        .write          = wdt977_write,
        .unlocked_ioctl = wdt977_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = wdt977_open,
        .release        = wdt977_release,
 };

diff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c
index 66303ab95685dca8544e40587b09663b0f47d2fa..e528024faa41d2cfadb33b0581f0b9d12c2086ec 100644 (file)
--- a/drivers/watchdog/wdt_pci.c
+++ b/drivers/watchdog/wdt_pci.c
@@ -566,6 +566,7 @@ static const struct file_operations wdtpci_fops = {
        .llseek         = no_llseek,
        .write          = wdtpci_write,
        .unlocked_ioctl = wdtpci_ioctl,
+       .compat_ioctl   = compat_ptr_ioctl,
        .open           = wdtpci_open,
        .release        = wdtpci_release,
 };

diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index b20228c19ccd50d9a939ae11b167028607ff63fd..10ba2d9e20bc5e030e2174d6c5192df6ace51f60 100644 (file)
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -412,17 +412,6 @@ COMPATIBLE_IOCTL(PPPIOCDISCONN)
 COMPATIBLE_IOCTL(PPPIOCATTCHAN)
 COMPATIBLE_IOCTL(PPPIOCGCHAN)
 COMPATIBLE_IOCTL(PPPIOCGL2TPSTATS)
-/* Watchdog */
-COMPATIBLE_IOCTL(WDIOC_GETSUPPORT)
-COMPATIBLE_IOCTL(WDIOC_GETSTATUS)
-COMPATIBLE_IOCTL(WDIOC_GETBOOTSTATUS)
-COMPATIBLE_IOCTL(WDIOC_GETTEMP)
-COMPATIBLE_IOCTL(WDIOC_SETOPTIONS)
-COMPATIBLE_IOCTL(WDIOC_KEEPALIVE)
-COMPATIBLE_IOCTL(WDIOC_SETTIMEOUT)
-COMPATIBLE_IOCTL(WDIOC_GETTIMEOUT)
-COMPATIBLE_IOCTL(WDIOC_SETPRETIMEOUT)
-COMPATIBLE_IOCTL(WDIOC_GETPRETIMEOUT)
 };
 
 /*