8 files changed, 100 insertions, 33 deletions

diff --git a/drivers/char/bsr.c b/drivers/char/bsr.c
index f6094ae0ef33..140ea10ecb88 100644
--- a/drivers/char/bsr.c
+++ b/drivers/char/bsr.c
@@ -140,7 +140,7 @@ static int bsr_open(struct inode * inode, struct file * filp)
         return 0;
 }
 
-const static struct file_operations bsr_fops = {
+static const struct file_operations bsr_fops = {
         .owner = THIS_MODULE,
         .mmap  = bsr_mmap,
         .open  = bsr_open,
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index 32b8bbf5003e..50dfa3bc71ce 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -713,7 +713,7 @@ static struct ctl_table_header *sysctl_header;
  */
 #define TICK_CALIBRATE  (1000UL)
 
-static unsigned long hpet_calibrate(struct hpets *hpetp)
+static unsigned long __hpet_calibrate(struct hpets *hpetp)
 {
         struct hpet_timer __iomem *timer = NULL;
         unsigned long t, m, count, i, flags, start;
@@ -750,6 +750,26 @@ static unsigned long hpet_calibrate(struct hpets *hpetp)
         return (m - start) / i;
 }
 
+static unsigned long hpet_calibrate(struct hpets *hpetp)
+{
+        unsigned long ret = -1;
+        unsigned long tmp;
+
+        /*
+         * Try to calibrate until return value becomes stable small value.
+         * If SMI interruption occurs in calibration loop, the return value
+         * will be big. This avoids its impact.
+         */
+        for ( ; ; ) {
+                tmp = __hpet_calibrate(hpetp);
+                if (ret <= tmp)
+                        break;
+                ret = tmp;
+        }
+
+        return ret;
+}
+
 int hpet_alloc(struct hpet_data *hdp)
 {
         u64 cap, mcfg;
diff --git a/drivers/char/hw_random/timeriomem-rng.c b/drivers/char/hw_random/timeriomem-rng.c
index 10ad41be5897..dcd352ad0e7f 100644
--- a/drivers/char/hw_random/timeriomem-rng.c
+++ b/drivers/char/hw_random/timeriomem-rng.c
@@ -90,10 +90,30 @@ static struct hwrng timeriomem_rng_ops = {
 
 static int __init timeriomem_rng_probe(struct platform_device *pdev)
 {
+        struct resource *res, *mem;
         int ret;
 
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+
+        if (!res)
+                return -ENOENT;
+
+        mem = request_mem_region(res->start, res->end - res->start + 1,
+                                 pdev->name);
+        if (mem == NULL)
+                return -EBUSY;
+
+        dev_set_drvdata(&pdev->dev, mem);
+
         timeriomem_rng_data = pdev->dev.platform_data;
 
+        timeriomem_rng_data->address = ioremap(res->start,
+                                                res->end - res->start + 1);
+        if (!timeriomem_rng_data->address) {
+                ret = -ENOMEM;
+                goto err_ioremap;
+        }
+
         if (timeriomem_rng_data->period != 0
                 && usecs_to_jiffies(timeriomem_rng_data->period) > 0) {
                 timeriomem_rng_timer.expires = jiffies;
@@ -104,23 +124,34 @@ static int __init timeriomem_rng_probe(struct platform_device *pdev)
         timeriomem_rng_data->present = 1;
 
         ret = hwrng_register(&timeriomem_rng_ops);
-        if (ret) {
-                dev_err(&pdev->dev, "problem registering\n");
-                return ret;
-        }
+        if (ret)
+                goto err_register;
 
         dev_info(&pdev->dev, "32bits from 0x%p @ %dus\n",
                         timeriomem_rng_data->address,
                         timeriomem_rng_data->period);
 
         return 0;
+
+err_register:
+        dev_err(&pdev->dev, "problem registering\n");
+        iounmap(timeriomem_rng_data->address);
+err_ioremap:
+        release_resource(mem);
+
+        return ret;
 }
 
 static int __devexit timeriomem_rng_remove(struct platform_device *pdev)
 {
+        struct resource *mem = dev_get_drvdata(&pdev->dev);
+
         del_timer_sync(&timeriomem_rng_timer);
         hwrng_unregister(&timeriomem_rng_ops);
 
+        iounmap(timeriomem_rng_data->address);
+        release_resource(mem);
+
         return 0;
 }
 
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 7c43ae782b26..f824ef8a9273 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1488,7 +1488,8 @@ static void rekey_seq_generator(struct work_struct *work)
         keyptr->count = (ip_cnt & COUNT_MASK) << HASH_BITS;
         smp_wmb();
         ip_cnt++;
-        schedule_delayed_work(&rekey_work, REKEY_INTERVAL);
+        schedule_delayed_work(&rekey_work,
+                              round_jiffies_relative(REKEY_INTERVAL));
 }
 
 static inline struct keydata *get_keyptr(void)
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c
index 6ec6e13d47d7..5e256494686a 100644
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
@@ -298,6 +298,7 @@ struct slgt_info {
 
         unsigned int rbuf_fill_level;
         unsigned int if_mode;
+        unsigned int base_clock;
 
         /* device status */
 
@@ -1156,22 +1157,26 @@ static long set_params32(struct slgt_info *info, struct MGSL_PARAMS32 __user *ne
                 return -EFAULT;
 
         spin_lock(&info->lock);
-        info->params.mode            = tmp_params.mode;
-        info->params.loopback        = tmp_params.loopback;
-        info->params.flags           = tmp_params.flags;
-        info->params.encoding        = tmp_params.encoding;
-        info->params.clock_speed     = tmp_params.clock_speed;
-        info->params.addr_filter     = tmp_params.addr_filter;
-        info->params.crc_type        = tmp_params.crc_type;
-        info->params.preamble_length = tmp_params.preamble_length;
-        info->params.preamble        = tmp_params.preamble;
-        info->params.data_rate       = tmp_params.data_rate;
-        info->params.data_bits       = tmp_params.data_bits;
-        info->params.stop_bits       = tmp_params.stop_bits;
-        info->params.parity          = tmp_params.parity;
+        if (tmp_params.mode == MGSL_MODE_BASE_CLOCK) {
+                info->base_clock = tmp_params.clock_speed;
+        } else {
+                info->params.mode            = tmp_params.mode;
+                info->params.loopback        = tmp_params.loopback;
+                info->params.flags           = tmp_params.flags;
+                info->params.encoding        = tmp_params.encoding;
+                info->params.clock_speed     = tmp_params.clock_speed;
+                info->params.addr_filter     = tmp_params.addr_filter;
+                info->params.crc_type        = tmp_params.crc_type;
+                info->params.preamble_length = tmp_params.preamble_length;
+                info->params.preamble        = tmp_params.preamble;
+                info->params.data_rate       = tmp_params.data_rate;
+                info->params.data_bits       = tmp_params.data_bits;
+                info->params.stop_bits       = tmp_params.stop_bits;
+                info->params.parity          = tmp_params.parity;
+        }
         spin_unlock(&info->lock);
 
-        change_params(info);
+        program_hw(info);
 
         return 0;
 }
@@ -2559,10 +2564,13 @@ static int set_params(struct slgt_info *info, MGSL_PARAMS __user *new_params)
                 return -EFAULT;
 
         spin_lock_irqsave(&info->lock, flags);
-        memcpy(&info->params, &tmp_params, sizeof(MGSL_PARAMS));
+        if (tmp_params.mode == MGSL_MODE_BASE_CLOCK)
+                info->base_clock = tmp_params.clock_speed;
+        else
+                memcpy(&info->params, &tmp_params, sizeof(MGSL_PARAMS));
         spin_unlock_irqrestore(&info->lock, flags);
 
-        change_params(info);
+        program_hw(info);
 
         return 0;
 }
@@ -3432,6 +3440,7 @@ static struct slgt_info *alloc_dev(int adapter_num, int port_num, struct pci_dev
                 info->magic = MGSL_MAGIC;
                 INIT_WORK(&info->task, bh_handler);
                 info->max_frame_size = 4096;
+                info->base_clock = 14745600;
                 info->rbuf_fill_level = DMABUFSIZE;
                 info->port.close_delay = 5*HZ/10;
                 info->port.closing_wait = 30*HZ;
@@ -3779,7 +3788,7 @@ static void enable_loopback(struct slgt_info *info)
 static void set_rate(struct slgt_info *info, u32 rate)
 {
         unsigned int div;
-        static unsigned int osc = 14745600;
+        unsigned int osc = info->base_clock;
 
         /* div = osc/rate - 1
          *
@@ -4083,18 +4092,27 @@ static void async_mode(struct slgt_info *info)
          * 06  CTS      IRQ enable
          * 05  DCD      IRQ enable
          * 04  RI       IRQ enable
-         * 03  reserved, must be zero
+         * 03  0=16x sampling, 1=8x sampling
          * 02  1=txd->rxd internal loopback enable
          * 01  reserved, must be zero
          * 00  1=master IRQ enable
          */
         val = BIT15 + BIT14 + BIT0;
+        /* JCR[8] : 1 = x8 async mode feature available */
+        if ((rd_reg32(info, JCR) & BIT8) && info->params.data_rate &&
+            ((info->base_clock < (info->params.data_rate * 16)) ||
+             (info->base_clock % (info->params.data_rate * 16)))) {
+                /* use 8x sampling */
+                val |= BIT3;
+                set_rate(info, info->params.data_rate * 8);
+        } else {
+                /* use 16x sampling */
+                set_rate(info, info->params.data_rate * 16);
+        }
         wr_reg16(info, SCR, val);
 
         slgt_irq_on(info, IRQ_RXBREAK | IRQ_RXOVER);
 
-        set_rate(info, info->params.data_rate * 16);
-
         if (info->params.loopback)
                 enable_loopback(info);
 }
diff --git a/drivers/char/tty_audit.c b/drivers/char/tty_audit.c
index 34ab6d798f81..55ba6f142883 100644
--- a/drivers/char/tty_audit.c
+++ b/drivers/char/tty_audit.c
@@ -10,8 +10,6 @@
  */
 
 #include <linux/audit.h>
-#include <linux/file.h>
-#include <linux/fdtable.h>
 #include <linux/tty.h>
 
 struct tty_audit_buf {
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 33dac94922a7..66b99a2049e3 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -1758,7 +1758,7 @@ static int __tty_open(struct inode *inode, struct file *filp)
         struct tty_driver *driver;
         int index;
         dev_t device = inode->i_rdev;
-        unsigned short saved_flags = filp->f_flags;
+        unsigned saved_flags = filp->f_flags;
 
         nonseekable_open(inode, filp);
 
@@ -2681,7 +2681,7 @@ void __do_SAK(struct tty_struct *tty)
         /* Kill the entire session */
         do_each_pid_task(session, PIDTYPE_SID, p) {
                 printk(KERN_NOTICE "SAK: killed process %d"
-                        " (%s): task_session_nr(p)==tty->session\n",
+                        " (%s): task_session(p)==tty->session\n",
                         task_pid_nr(p), p->comm);
                 send_sig(SIGKILL, p, 1);
         } while_each_pid_task(session, PIDTYPE_SID, p);
@@ -2691,7 +2691,7 @@ void __do_SAK(struct tty_struct *tty)
         do_each_thread(g, p) {
                 if (p->signal->tty == tty) {
                         printk(KERN_NOTICE "SAK: killed process %d"
-                            " (%s): task_session_nr(p)==tty->session\n",
+                            " (%s): task_session(p)==tty->session\n",
                             task_pid_nr(p), p->comm);
                         send_sig(SIGKILL, p, 1);
                         continue;
diff --git a/drivers/char/tty_ldisc.c b/drivers/char/tty_ldisc.c
index 7a84b406a952..f78f5b0127a8 100644
--- a/drivers/char/tty_ldisc.c
+++ b/drivers/char/tty_ldisc.c
@@ -10,7 +10,6 @@
 #include <linux/tty_flip.h>
 #include <linux/devpts_fs.h>
 #include <linux/file.h>
-#include <linux/fdtable.h>
 #include <linux/console.h>
 #include <linux/timer.h>
 #include <linux/ctype.h>