2 files changed, 2 insertions, 34 deletions

diff --git a/arch/xtensa/kernel/process.c b/arch/xtensa/kernel/process.c
index 08ef6d82ee51..6a44b54ae817 100644
--- a/arch/xtensa/kernel/process.c
+++ b/arch/xtensa/kernel/process.c
@@ -96,8 +96,9 @@ void cpu_idle(void)
         while (1) {
                 while (!need_resched())
                         platform_idle();
-                preempt_enable();
+                preempt_enable_no_resched();
                 schedule();
+                preempt_disable();
         }
 }
 
diff --git a/arch/xtensa/platform-iss/network.c b/arch/xtensa/platform-iss/network.c
index 0682ffd38175..96b9bb4a478d 100644
--- a/arch/xtensa/platform-iss/network.c
+++ b/arch/xtensa/platform-iss/network.c
@@ -611,38 +611,6 @@ static int iss_net_change_mtu(struct net_device *dev, int new_mtu)
         return -EINVAL;
 }
 
-static int iss_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
-{
-#if 0
-        static const struct ethtool_drvinfo info = {
-                .cmd     = ETHTOOL_GDRVINFO,
-                .driver  = DRIVER_NAME,
-                .version = "42",
-        };
-        void *useraddr;
-        u32 ethcmd;
-
-        switch (cmd) {
-        case SIOCETHTOOL:
-                useraddr = ifr->ifr_data;
-                if (copy_from_user(&ethcmd, useraddr, sizeof(ethcmd)))
-                        return -EFAULT;
-
-                switch (ethcmd) {
-                        case ETHTOOL_GDRVINFO:
-                                if (copy_to_user(useraddr, &info, sizeof(info)))
-                                        return -EFAULT;
-                                return 0;
-                        default:
-                                return -EOPNOTSUPP;
-                }
-        default:
-                return -EINVAL;
-        }
-#endif
-        return -EINVAL;
-}
-
 void iss_net_user_timer_expire(unsigned long _conn)
 {
 }
@@ -730,7 +698,6 @@ static int iss_net_configure(int index, char *init)
         dev->tx_timeout = iss_net_tx_timeout;
         dev->set_mac_address = iss_net_set_mac;
         dev->change_mtu = iss_net_change_mtu;
-        dev->do_ioctl = iss_net_ioctl;
         dev->watchdog_timeo = (HZ >> 1);
         dev->irq = -1;