Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

Pull UML updates from Richard Weinberger:
 "Most changes are bug fixes and cleanups"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  um: missing checks of __put_user()/__get_user() return values
  um: stub_rt_sigsuspend isn't needed these days anymore
  um/x86: merge (and trim) 32- and 64-bit variants of ptrace.h
  irq: Remove irq_chip->release()
  um: Remove CONFIG_IRQ_RELEASE_METHOD
  um: Remove usage of irq_chip->release()
  um: Implement um_free_irq()
  um: Fix __swp_type()
  um: Implement a custom pte_same() function
  um: Add BUG() to do_ops()'s error path
  um: Remove unused variables
  um: bury unused _TIF_RESTORE_SIGMASK
  um: wrong sigmask saved in case of multiple sigframes
  um: add TIF_NOTIFY_RESUME
  um: ->restart_block.fn needs to be reset on sigreturn

16 files changed, 42 insertions, 43 deletions

diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common
index 20a49ba93cb9..43ef890d292c 100644
--- a/arch/um/Kconfig.common
+++ b/arch/um/Kconfig.common
@@ -56,11 +56,6 @@ config GENERIC_CLOCKEVENTS
         bool
         default y
 
-# Used in kernel/irq/manage.c and include/linux/irq.h
-config IRQ_RELEASE_METHOD
-        bool
-        default y
-
 config HZ
         int
         default 100
diff --git a/arch/um/defconfig b/arch/um/defconfig
index fdc97e2c3d73..7823ab12e6a4 100644
--- a/arch/um/defconfig
+++ b/arch/um/defconfig
@@ -12,7 +12,6 @@ CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_IRQ_RELEASE_METHOD=y
 CONFIG_HZ=100
 
 #
diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
index ca4c7ebfd0aa..45e248c2f43c 100644
--- a/arch/um/drivers/chan_kern.c
+++ b/arch/um/drivers/chan_kern.c
@@ -8,6 +8,7 @@
 #include <linux/tty_flip.h>
 #include "chan.h"
 #include "os.h"
+#include "irq_kern.h"
 
 #ifdef CONFIG_NOCONFIG_CHAN
 static void *not_configged_init(char *str, int device,
@@ -213,9 +214,9 @@ void free_irqs(void)
                 chan = list_entry(ele, struct chan, free_list);
 
                 if (chan->input && chan->enabled)
-                        free_irq(chan->line->driver->read_irq, chan);
+                        um_free_irq(chan->line->driver->read_irq, chan);
                 if (chan->output && chan->enabled)
-                        free_irq(chan->line->driver->write_irq, chan);
+                        um_free_irq(chan->line->driver->write_irq, chan);
                 chan->enabled = 0;
         }
 }
@@ -234,9 +235,9 @@ static void close_one_chan(struct chan *chan, int delay_free_irq)
         }
         else {
                 if (chan->input && chan->enabled)
-                        free_irq(chan->line->driver->read_irq, chan);
+                        um_free_irq(chan->line->driver->read_irq, chan);
                 if (chan->output && chan->enabled)
-                        free_irq(chan->line->driver->write_irq, chan);
+                        um_free_irq(chan->line->driver->write_irq, chan);
                 chan->enabled = 0;
         }
         if (chan->ops->close != NULL)
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index 4ab0d9c0911c..acfd0e0fd0c9 100644
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
@@ -699,7 +699,7 @@ struct winch {
 static void __free_winch(struct work_struct *work)
 {
         struct winch *winch = container_of(work, struct winch, work);
-        free_irq(WINCH_IRQ, winch);
+        um_free_irq(WINCH_IRQ, winch);
 
         if (winch->pid != -1)
                 os_kill_process(winch->pid, 1);
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 95f4416e6d9f..0d60c5685c26 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -195,7 +195,7 @@ static int uml_net_close(struct net_device *dev)
 
         netif_stop_queue(dev);
 
-        free_irq(dev->irq, dev);
+        um_free_irq(dev->irq, dev);
         if (lp->close != NULL)
                 (*lp->close)(lp->fd, &lp->user);
         lp->fd = -1;
@@ -835,7 +835,7 @@ static void close_devices(void)
         spin_lock(&opened_lock);
         list_for_each(ele, &opened) {
                 lp = list_entry(ele, struct uml_net_private, list);
-                free_irq(lp->dev->irq, lp->dev);
+                um_free_irq(lp->dev->irq, lp->dev);
                 if ((lp->close != NULL) && (lp->fd >= 0))
                         (*lp->close)(lp->fd, &lp->user);
                 if (lp->remove != NULL)
diff --git a/arch/um/drivers/port_kern.c b/arch/um/drivers/port_kern.c
index e31680e662a4..11866ffd45a9 100644
--- a/arch/um/drivers/port_kern.c
+++ b/arch/um/drivers/port_kern.c
@@ -254,7 +254,7 @@ int port_wait(void *data)
                  * connection.  Then we loop here throwing out failed
                  * connections until a good one is found.
                  */
-                free_irq(TELNETD_IRQ, conn);
+                um_free_irq(TELNETD_IRQ, conn);
 
                 if (conn->fd >= 0)
                         break;
diff --git a/arch/um/drivers/xterm_kern.c b/arch/um/drivers/xterm_kern.c
index 8bd130f0bda3..b68bbe269e01 100644
--- a/arch/um/drivers/xterm_kern.c
+++ b/arch/um/drivers/xterm_kern.c
@@ -65,7 +65,7 @@ int xterm_fd(int socket, int *pid_out)
          * isn't set) this will hang... */
         wait_for_completion(&data->ready);
 
-        free_irq(XTERM_IRQ, data);
+        um_free_irq(XTERM_IRQ, data);
 
         ret = data->new_fd;
         *pid_out = data->pid;
diff --git a/arch/um/include/asm/pgtable.h b/arch/um/include/asm/pgtable.h
index 6a3f9845743e..5888f1b83477 100644
--- a/arch/um/include/asm/pgtable.h
+++ b/arch/um/include/asm/pgtable.h
@@ -273,6 +273,12 @@ static inline void set_pte(pte_t *pteptr, pte_t pteval)
 }
 #define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
 
+#define __HAVE_ARCH_PTE_SAME
+static inline int pte_same(pte_t pte_a, pte_t pte_b)
+{
+        return !((pte_val(pte_a) ^ pte_val(pte_b)) & ~_PAGE_NEWPAGE);
+}
+
 /*
  * Conversion functions: convert a page and protection to a page entry,
  * and a page entry and page directory to the page they refer to.
@@ -348,11 +354,11 @@ extern pte_t *virt_to_pte(struct mm_struct *mm, unsigned long addr);
 #define update_mmu_cache(vma,address,ptep) do ; while (0)
 
 /* Encode and de-code a swap entry */
-#define __swp_type(x)                   (((x).val >> 4) & 0x3f)
+#define __swp_type(x)                   (((x).val >> 5) & 0x1f)
 #define __swp_offset(x)                 ((x).val >> 11)
 
 #define __swp_entry(type, offset) \
-        ((swp_entry_t) { ((type) << 4) | ((offset) << 11) })
+        ((swp_entry_t) { ((type) << 5) | ((offset) << 11) })
 #define __pte_to_swp_entry(pte) \
         ((swp_entry_t) { pte_val(pte_mkuptodate(pte)) })
 #define __swp_entry_to_pte(x)           ((pte_t) { (x).val })
diff --git a/arch/um/include/asm/thread_info.h b/arch/um/include/asm/thread_info.h
index 200c4ab1240c..c04e5ab68f56 100644
--- a/arch/um/include/asm/thread_info.h
+++ b/arch/um/include/asm/thread_info.h
@@ -71,6 +71,7 @@ static inline struct thread_info *current_thread_info(void)
 #define TIF_MEMDIE              5       /* is terminating due to OOM killer */
 #define TIF_SYSCALL_AUDIT       6
 #define TIF_RESTORE_SIGMASK     7
+#define TIF_NOTIFY_RESUME       8
 
 #define _TIF_SYSCALL_TRACE      (1 << TIF_SYSCALL_TRACE)
 #define _TIF_SIGPENDING         (1 << TIF_SIGPENDING)
@@ -78,6 +79,5 @@ static inline struct thread_info *current_thread_info(void)
 #define _TIF_POLLING_NRFLAG     (1 << TIF_POLLING_NRFLAG)
 #define _TIF_MEMDIE             (1 << TIF_MEMDIE)
 #define _TIF_SYSCALL_AUDIT      (1 << TIF_SYSCALL_AUDIT)
-#define _TIF_RESTORE_SIGMASK    (1 << TIF_RESTORE_SIGMASK)
 
 #endif
diff --git a/arch/um/include/shared/irq_kern.h b/arch/um/include/shared/irq_kern.h
index b05d22f3d84e..7a5bfa6291b8 100644
--- a/arch/um/include/shared/irq_kern.h
+++ b/arch/um/include/shared/irq_kern.h
@@ -13,6 +13,6 @@ extern int um_request_irq(unsigned int irq, int fd, int type,
                           irq_handler_t handler,
                           unsigned long irqflags,  const char * devname,
                           void *dev_id);
-
+void um_free_irq(unsigned int irq, void *dev);
 #endif
 
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index 71b8c947e5ef..00506c3d5d6e 100644
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
@@ -297,6 +297,13 @@ unsigned int do_IRQ(int irq, struct uml_pt_regs *regs)
         return 1;
 }
 
+void um_free_irq(unsigned int irq, void *dev)
+{
+        free_irq_by_irq_and_dev(irq, dev);
+        free_irq(irq, dev);
+}
+EXPORT_SYMBOL(um_free_irq);
+
 int um_request_irq(unsigned int irq, int fd, int type,
                    irq_handler_t handler,
                    unsigned long irqflags, const char * devname,
@@ -327,7 +334,6 @@ static void dummy(struct irq_data *d)
 /* This is used for everything else than the timer. */
 static struct irq_chip normal_irq_type = {
         .name = "SIGIO",
-        .release = free_irq_by_irq_and_dev,
         .irq_disable = dummy,
         .irq_enable = dummy,
         .irq_ack = dummy,
@@ -335,7 +341,6 @@ static struct irq_chip normal_irq_type = {
 
 static struct irq_chip SIGVTALRM_irq_type = {
         .name = "SIGVTALRM",
-        .release = free_irq_by_irq_and_dev,
         .irq_disable = dummy,
         .irq_enable = dummy,
         .irq_ack = dummy,
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index 2b73dedb44ca..3a2235e0abc3 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -18,6 +18,7 @@
 #include <linux/seq_file.h>
 #include <linux/tick.h>
 #include <linux/threads.h>
+#include <linux/tracehook.h>
 #include <asm/current.h>
 #include <asm/pgtable.h>
 #include <asm/mmu_context.h>
@@ -114,8 +115,13 @@ void interrupt_end(void)
 {
         if (need_resched())
                 schedule();
-        if (test_tsk_thread_flag(current, TIF_SIGPENDING))
+        if (test_thread_flag(TIF_SIGPENDING))
                 do_signal();
+        if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME)) {
+                tracehook_notify_resume(&current->thread.regs);
+                if (current->replacement_session_keyring)
+                        key_replace_session_keyring();
+        }
 }
 
 void exit_thread(void)
@@ -190,7 +196,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
         if (current->thread.forking) {
                 memcpy(&p->thread.regs.regs, &regs->regs,
                        sizeof(p->thread.regs.regs));
-                REGS_SET_SYSCALL_RETURN(p->thread.regs.regs.gp, 0);
+                UPT_SET_SYSCALL_RETURN(&p->thread.regs.regs, 0);
                 if (sp != 0)
                         REGS_SP(p->thread.regs.regs.gp) = sp;
 
diff --git a/arch/um/kernel/signal.c b/arch/um/kernel/signal.c
index fb12f4c5e649..187118fbe1bc 100644
--- a/arch/um/kernel/signal.c
+++ b/arch/um/kernel/signal.c
@@ -29,9 +29,6 @@ static int handle_signal(struct pt_regs *regs, unsigned long signr,
         unsigned long sp;
         int err;
 
-        /* Always make any pending restarted system calls return -EINTR */
-        current_thread_info()->restart_block.fn = do_no_restart_syscall;
-
         /* Did we come from a system call? */
         if (PT_REGS_SYSCALL_NR(regs) >= 0) {
                 /* If so, check system call restarting.. */
@@ -77,15 +74,14 @@ static int kern_do_signal(struct pt_regs *regs)
 {
         struct k_sigaction ka_copy;
         siginfo_t info;
-        sigset_t *oldset;
         int sig, handled_sig = 0;
 
-        if (test_thread_flag(TIF_RESTORE_SIGMASK))
-                oldset = &current->saved_sigmask;
-        else
-                oldset = &current->blocked;
-
         while ((sig = get_signal_to_deliver(&info, &ka_copy, regs, NULL)) > 0) {
+                sigset_t *oldset;
+                if (test_thread_flag(TIF_RESTORE_SIGMASK))
+                        oldset = &current->saved_sigmask;
+                else
+                        oldset = &current->blocked;
                 handled_sig = 1;
                 /* Whee!  Actually deliver the signal.  */
                 if (!handle_signal(regs, sig, &ka_copy, &info, oldset)) {
diff --git a/arch/um/kernel/skas/syscall.c b/arch/um/kernel/skas/syscall.c
index f5173e1ec3ac..05fbeb480e0b 100644
--- a/arch/um/kernel/skas/syscall.c
+++ b/arch/um/kernel/skas/syscall.c
@@ -34,7 +34,7 @@ void handle_syscall(struct uml_pt_regs *r)
                 result = -ENOSYS;
         else result = EXECUTE_SYSCALL(syscall, regs);
 
-        REGS_SET_SYSCALL_RETURN(r->gp, result);
+        UPT_SET_SYSCALL_RETURN(r, result);
 
         syscall_trace(r, 1);
 }
diff --git a/arch/um/kernel/tlb.c b/arch/um/kernel/tlb.c
index 7f3d4d86431a..f819af951c19 100644
--- a/arch/um/kernel/tlb.c
+++ b/arch/um/kernel/tlb.c
@@ -75,6 +75,7 @@ static int do_ops(struct host_vm_change *hvc, int end,
                 default:
                         printk(KERN_ERR "Unknown op type %d in do_ops\n",
                                op->type);
+                        BUG();
                         break;
                 }
         }
diff --git a/arch/um/os-Linux/skas/mem.c b/arch/um/os-Linux/skas/mem.c
index c0afff7af4bd..90b310d29179 100644
--- a/arch/um/os-Linux/skas/mem.c
+++ b/arch/um/os-Linux/skas/mem.c
@@ -48,10 +48,6 @@ __initcall(init_syscall_regs);
 
 extern int proc_mm;
 
-int single_count = 0;
-int multi_count = 0;
-int multi_op_count = 0;
-
 static inline long do_syscall_stub(struct mm_id * mm_idp, void **addr)
 {
         int n, i;
@@ -64,8 +60,6 @@ static inline long do_syscall_stub(struct mm_id * mm_idp, void **addr)
                 /* FIXME: Need to look up userspace_pid by cpu */
                 pid = userspace_pid[0];
 
-        multi_count++;
-
         n = ptrace_setregs(pid, syscall_regs);
         if (n < 0) {
                 printk(UM_KERN_ERR "Registers - \n");
@@ -126,9 +120,6 @@ long run_syscall_stub(struct mm_id * mm_idp, int syscall,
 {
         unsigned long *stack = check_init_stack(mm_idp, *addr);
 
-        if (done && *addr == NULL)
-                single_count++;
-
         *stack += sizeof(long);
         stack += *stack / sizeof(long);
 
@@ -141,7 +132,6 @@ long run_syscall_stub(struct mm_id * mm_idp, int syscall,
         *stack++ = args[5];
         *stack++ = expected;
         *stack = 0;
-        multi_op_count++;
 
         if (!done && ((((unsigned long) stack) & ~UM_KERN_PAGE_MASK) <
                      UM_KERN_PAGE_SIZE - 10 * sizeof(long))) {