7 files changed, 22 insertions, 47 deletions

diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common
index 0d207e73a758..7c8e277f6d34 100644
--- a/arch/um/Kconfig.common
+++ b/arch/um/Kconfig.common
@@ -55,10 +55,6 @@ config GENERIC_BUG
         default y
         depends on BUG
 
-config GENERIC_TIME
-        bool
-        default y
-
 config GENERIC_CLOCKEVENTS
         bool
         default y
diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
index 6e51424745ab..25e1965df7ce 100644
--- a/arch/um/drivers/chan_kern.c
+++ b/arch/um/drivers/chan_kern.c
@@ -210,9 +210,9 @@ void free_irqs(void)
         list_for_each(ele, &list) {
                 chan = list_entry(ele, struct chan, free_list);
 
-                if (chan->input)
+                if (chan->input && chan->enabled)
                         free_irq(chan->line->driver->read_irq, chan);
-                if (chan->output)
+                if (chan->output && chan->enabled)
                         free_irq(chan->line->driver->write_irq, chan);
                 chan->enabled = 0;
         }
@@ -231,9 +231,9 @@ static void close_one_chan(struct chan *chan, int delay_free_irq)
                 spin_unlock_irqrestore(&irqs_to_free_lock, flags);
         }
         else {
-                if (chan->input)
+                if (chan->input && chan->enabled)
                         free_irq(chan->line->driver->read_irq, chan);
-                if (chan->output)
+                if (chan->output && chan->enabled)
                         free_irq(chan->line->driver->write_irq, chan);
                 chan->enabled = 0;
         }
diff --git a/arch/um/drivers/hostaudio_kern.c b/arch/um/drivers/hostaudio_kern.c
index ae42695c3597..68142df76608 100644
--- a/arch/um/drivers/hostaudio_kern.c
+++ b/arch/um/drivers/hostaudio_kern.c
@@ -8,6 +8,7 @@
 #include "linux/slab.h"
 #include "linux/sound.h"
 #include "linux/soundcard.h"
+#include "linux/smp_lock.h"
 #include "asm/uaccess.h"
 #include "init.h"
 #include "os.h"
@@ -198,7 +199,10 @@ static int hostaudio_open(struct inode *inode, struct file *file)
         if (file->f_mode & FMODE_WRITE)
                 w = 1;
 
+        lock_kernel();
         ret = os_open_file(dsp, of_set_rw(OPENFLAGS(), r, w), 0);
+        unlock_kernel();
+
         if (ret < 0) {
                 kfree(state);
                 return ret;
@@ -254,7 +258,9 @@ static int hostmixer_open_mixdev(struct inode *inode, struct file *file)
         if (file->f_mode & FMODE_WRITE)
                 w = 1;
 
+        lock_kernel();
         ret = os_open_file(mixer, of_set_rw(OPENFLAGS(), r, w), 0);
+        unlock_kernel();
 
         if (ret < 0) {
                 printk(KERN_ERR "hostaudio_open_mixdev failed to open '%s', "
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index f05372694233..2ab233ba32c1 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -25,11 +25,6 @@
 #include "net_kern.h"
 #include "net_user.h"
 
-static inline void set_ether_mac(struct net_device *dev, unsigned char *addr)
-{
-        memcpy(dev->dev_addr, addr, ETH_ALEN);
-}
-
 #define DRIVER_NAME "uml-netdev"
 
 static DEFINE_SPINLOCK(opened_lock);
@@ -266,7 +261,7 @@ static int uml_net_set_mac(struct net_device *dev, void *addr)
         struct sockaddr *hwaddr = addr;
 
         spin_lock_irq(&lp->lock);
-        set_ether_mac(dev, hwaddr->sa_data);
+        eth_mac_addr(dev, hwaddr->sa_data);
         spin_unlock_irq(&lp->lock);
 
         return 0;
@@ -380,7 +375,6 @@ static const struct net_device_ops uml_netdev_ops = {
         .ndo_tx_timeout         = uml_net_tx_timeout,
         .ndo_set_mac_address    = uml_net_set_mac,
         .ndo_change_mtu         = uml_net_change_mtu,
-        .ndo_set_mac_address    = eth_mac_addr,
         .ndo_validate_addr      = eth_validate_addr,
 };
 
@@ -478,7 +472,7 @@ static void eth_configure(int n, void *init, char *mac,
             ((*transport->user->init)(&lp->user, dev) != 0))
                 goto out_unregister;
 
-        set_ether_mac(dev, device->mac);
+        eth_mac_addr(dev, device->mac);
         dev->mtu = transport->user->mtu;
         dev->netdev_ops = &uml_netdev_ops;
         dev->ethtool_ops = &uml_net_ethtool_ops;
diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
index 084de4a9fc70..0032f9212e74 100644
--- a/arch/um/include/asm/pgtable-3level.h
+++ b/arch/um/include/asm/pgtable-3level.h
@@ -60,7 +60,7 @@
         set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
 
 #ifdef CONFIG_64BIT
-#define set_pud(pudptr, pudval) set_64bit((phys_t *) (pudptr), pud_val(pudval))
+#define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
 #else
 #define set_pud(pudptr, pudval) (*(pudptr) = (pudval))
 #endif
@@ -73,7 +73,7 @@ static inline int pgd_newpage(pgd_t pgd)
 static inline void pgd_mkuptodate(pgd_t pgd) { pgd_val(pgd) &= ~_PAGE_NEWPAGE; }
 
 #ifdef CONFIG_64BIT
-#define set_pmd(pmdptr, pmdval) set_64bit((phys_t *) (pmdptr), pmd_val(pmdval))
+#define set_pmd(pmdptr, pmdval) set_64bit((u64 *) (pmdptr), pmd_val(pmdval))
 #else
 #define set_pmd(pmdptr, pmdval) (*(pmdptr) = (pmdval))
 #endif
diff --git a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c
index 484509948ee9..e0510496596c 100644
--- a/arch/um/kernel/ptrace.c
+++ b/arch/um/kernel/ptrace.c
@@ -7,9 +7,6 @@
 #include "linux/ptrace.h"
 #include "linux/sched.h"
 #include "asm/uaccess.h"
-#ifdef CONFIG_PROC_MM
-#include "proc_mm.h"
-#endif
 #include "skas_ptrace.h"
 
 
@@ -158,24 +155,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                 break;
         }
 #endif
-#ifdef CONFIG_PROC_MM
-        case PTRACE_SWITCH_MM: {
-                struct mm_struct *old = child->mm;
-                struct mm_struct *new = proc_mm_get_mm(data);
-
-                if (IS_ERR(new)) {
-                        ret = PTR_ERR(new);
-                        break;
-                }
-
-                atomic_inc(&new->mm_users);
-                child->mm = new;
-                child->active_mm = new;
-                mmput(old);
-                ret = 0;
-                break;
-        }
-#endif
 #ifdef PTRACE_ARCH_PRCTL
         case PTRACE_ARCH_PRCTL:
                 /* XXX Calls ptrace on the host - needs some SMP thinking */
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c
index c8b9c469fcd7..a08d9fab81f2 100644
--- a/arch/um/kernel/time.c
+++ b/arch/um/kernel/time.c
@@ -102,16 +102,16 @@ static void __init setup_itimer(void)
         clockevents_register_device(&itimer_clockevent);
 }
 
-void __init time_init(void)
+void read_persistent_clock(struct timespec *ts)
 {
-        long long nsecs;
-
-        timer_init();
+        long long nsecs = os_nsecs();
 
-        nsecs = os_nsecs();
-        set_normalized_timespec(&wall_to_monotonic, -nsecs / NSEC_PER_SEC,
-                                -nsecs % NSEC_PER_SEC);
-        set_normalized_timespec(&xtime, nsecs / NSEC_PER_SEC,
+        set_normalized_timespec(ts, nsecs / NSEC_PER_SEC,
                                 nsecs % NSEC_PER_SEC);
+}
+
+void __init time_init(void)
+{
+        timer_init();
         late_time_init = setup_itimer;
 }