Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

6 files changed, 39 insertions, 81 deletions

diff --git a/arch/h8300/kernel/irq.c b/arch/h8300/kernel/irq.c
index c25dc2c2b1da..1f67fed476af 100644
--- a/arch/h8300/kernel/irq.c
+++ b/arch/h8300/kernel/irq.c
@@ -38,34 +38,30 @@ static inline int is_ext_irq(unsigned int irq)
         return (irq >= EXT_IRQ0 && irq <= (EXT_IRQ0 + EXT_IRQS));
 }
 
-static void h8300_enable_irq(unsigned int irq)
+static void h8300_enable_irq(struct irq_data *data)
 {
-        if (is_ext_irq(irq))
-                IER_REGS |= 1 << (irq - EXT_IRQ0);
+        if (is_ext_irq(data->irq))
+                IER_REGS |= 1 << (data->irq - EXT_IRQ0);
 }
 
-static void h8300_disable_irq(unsigned int irq)
+static void h8300_disable_irq(struct irq_data *data)
 {
-        if (is_ext_irq(irq))
-                IER_REGS &= ~(1 << (irq - EXT_IRQ0));
+        if (is_ext_irq(data->irq))
+                IER_REGS &= ~(1 << (data->irq - EXT_IRQ0));
 }
 
-static void h8300_end_irq(unsigned int irq)
+static unsigned int h8300_startup_irq(struct irq_data *data)
 {
-}
-
-static unsigned int h8300_startup_irq(unsigned int irq)
-{
-        if (is_ext_irq(irq))
-                return h8300_enable_irq_pin(irq);
+        if (is_ext_irq(data->irq))
+                return h8300_enable_irq_pin(data->irq);
         else
                 return 0;
 }
 
-static void h8300_shutdown_irq(unsigned int irq)
+static void h8300_shutdown_irq(struct irq_data *data)
 {
-        if (is_ext_irq(irq))
-                h8300_disable_irq_pin(irq);
+        if (is_ext_irq(data->irq))
+                h8300_disable_irq_pin(data->irq);
 }
 
 /*
@@ -73,12 +69,10 @@ static void h8300_shutdown_irq(unsigned int irq)
  */
 struct irq_chip h8300irq_chip = {
         .name           = "H8300-INTC",
-        .startup        = h8300_startup_irq,
-        .shutdown       = h8300_shutdown_irq,
-        .enable         = h8300_enable_irq,
-        .disable        = h8300_disable_irq,
-        .ack            = NULL,
-        .end            = h8300_end_irq,
+        .irq_startup    = h8300_startup_irq,
+        .irq_shutdown   = h8300_shutdown_irq,
+        .irq_enable     = h8300_enable_irq,
+        .irq_disable    = h8300_disable_irq,
 };
 
 #if defined(CONFIG_RAMKERNEL)
@@ -160,48 +154,13 @@ void __init init_IRQ(void)
 
         setup_vector();
 
-        for (c = 0; c < NR_IRQS; c++) {
-                irq_desc[c].status = IRQ_DISABLED;
-                irq_desc[c].action = NULL;
-                irq_desc[c].depth = 1;
-                irq_desc[c].chip = &h8300irq_chip;
-        }
+        for (c = 0; c < NR_IRQS; c++)
+                irq_set_chip_and_handler(c, &h8300irq_chip, handle_simple_irq);
 }
 
 asmlinkage void do_IRQ(int irq)
 {
         irq_enter();
-        __do_IRQ(irq);
+        generic_handle_irq(irq);
         irq_exit();
 }
-
-#if defined(CONFIG_PROC_FS)
-int show_interrupts(struct seq_file *p, void *v)
-{
-        int i = *(loff_t *) v;
-        struct irqaction * action;
-        unsigned long flags;
-
-        if (i == 0)
-                seq_puts(p, "           CPU0");
-
-        if (i < NR_IRQS) {
-                raw_spin_lock_irqsave(&irq_desc[i].lock, flags);
-                action = irq_desc[i].action;
-                if (!action)
-                        goto unlock;
-                seq_printf(p, "%3d: ",i);
-                seq_printf(p, "%10u ", kstat_irqs(i));
-                seq_printf(p, " %14s", irq_desc[i].chip->name);
-                seq_printf(p, "-%-8s", irq_desc[i].name);
-                seq_printf(p, "  %s", action->name);
-
-                for (action=action->next; action; action = action->next)
-                        seq_printf(p, ", %s", action->name);
-                seq_putc(p, '\n');
-unlock:
-                raw_spin_unlock_irqrestore(&irq_desc[i].lock, flags);
-        }
-        return 0;
-}
-#endif
diff --git a/arch/h8300/kernel/process.c b/arch/h8300/kernel/process.c
index 97478138e361..933bd388efb2 100644
--- a/arch/h8300/kernel/process.c
+++ b/arch/h8300/kernel/process.c
@@ -28,7 +28,6 @@
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/smp.h>
-#include <linux/smp_lock.h>
 #include <linux/stddef.h>
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
diff --git a/arch/h8300/kernel/ptrace.c b/arch/h8300/kernel/ptrace.c
index df114122ebdf..497fa89b5df4 100644
--- a/arch/h8300/kernel/ptrace.c
+++ b/arch/h8300/kernel/ptrace.c
@@ -50,27 +50,29 @@ void ptrace_disable(struct task_struct *child)
         user_disable_single_step(child);
 }
 
-long arch_ptrace(struct task_struct *child, long request, long addr, long data)
+long arch_ptrace(struct task_struct *child, long request,
+                 unsigned long addr, unsigned long data)
 {
         int ret;
+        int regno = addr >> 2;
+        unsigned long __user *datap = (unsigned long __user *) data;
 
         switch (request) {
         /* read the word at location addr in the USER area. */
                 case PTRACE_PEEKUSR: {
                         unsigned long tmp = 0;
                         
-                        if ((addr & 3) || addr < 0 || addr >= sizeof(struct user)) {
+                        if ((addr & 3) || addr >= sizeof(struct user)) {
                                 ret = -EIO;
                                 break ;
                         }
                         
                         ret = 0;  /* Default return condition */
-                        addr = addr >> 2; /* temporary hack. */
 
-                        if (addr < H8300_REGS_NO)
-                                tmp = h8300_get_reg(child, addr);
+                        if (regno < H8300_REGS_NO)
+                                tmp = h8300_get_reg(child, regno);
                         else {
-                                switch(addr) {
+                                switch (regno) {
                                 case 49:
                                         tmp = child->mm->start_code;
                                         break ;
@@ -88,24 +90,23 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                                 }
                         }
                         if (!ret)
-                                ret = put_user(tmp,(unsigned long *) data);
+                                ret = put_user(tmp, datap);
                         break ;
                 }
 
       /* when I and D space are separate, this will have to be fixed. */
                 case PTRACE_POKEUSR: /* write the word at location addr in the USER area */
-                        if ((addr & 3) || addr < 0 || addr >= sizeof(struct user)) {
+                        if ((addr & 3) || addr >= sizeof(struct user)) {
                                 ret = -EIO;
                                 break ;
                         }
-                        addr = addr >> 2; /* temporary hack. */
                             
-                        if (addr == PT_ORIG_ER0) {
+                        if (regno == PT_ORIG_ER0) {
                                 ret = -EIO;
                                 break ;
                         }
-                        if (addr < H8300_REGS_NO) {
-                                ret = h8300_put_reg(child, addr, data);
+                        if (regno < H8300_REGS_NO) {
+                                ret = h8300_put_reg(child, regno, data);
                                 break ;
                         }
                         ret = -EIO;
@@ -116,11 +117,11 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                         unsigned long tmp;
                         for (i = 0; i < H8300_REGS_NO; i++) {
                             tmp = h8300_get_reg(child, i);
-                            if (put_user(tmp, (unsigned long *) data)) {
+                            if (put_user(tmp, datap)) {
                                 ret = -EFAULT;
                                 break;
                             }
-                            data += sizeof(long);
+                            datap++;
                         }
                         ret = 0;
                         break;
@@ -130,12 +131,12 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                         int i;
                         unsigned long tmp;
                         for (i = 0; i < H8300_REGS_NO; i++) {
-                            if (get_user(tmp, (unsigned long *) data)) {
+                            if (get_user(tmp, datap)) {
                                 ret = -EFAULT;
                                 break;
                             }
                             h8300_put_reg(child, i, tmp);
-                            data += sizeof(long);
+                            datap++;
                         }
                         ret = 0;
                         break;
diff --git a/arch/h8300/kernel/syscalls.S b/arch/h8300/kernel/syscalls.S
index faefaff7d43d..f4b2e67bcc34 100644
--- a/arch/h8300/kernel/syscalls.S
+++ b/arch/h8300/kernel/syscalls.S
@@ -333,6 +333,7 @@ SYMBOL_NAME_LABEL(sys_call_table)
         .long SYMBOL_NAME(sys_ni_syscall)       /* sys_move_pages */
         .long SYMBOL_NAME(sys_getcpu)
         .long SYMBOL_NAME(sys_ni_syscall)       /* sys_epoll_pwait */
+        .long SYMBOL_NAME(sys_setns)            /* 320 */
 
         .macro  call_sp addr
         mov.l   #SYMBOL_NAME(\addr),er6
diff --git a/arch/h8300/kernel/time.c b/arch/h8300/kernel/time.c
index 165005aff9df..32263a138aa6 100644
--- a/arch/h8300/kernel/time.c
+++ b/arch/h8300/kernel/time.c
@@ -35,9 +35,7 @@ void h8300_timer_tick(void)
 {
         if (current->pid)
                 profile_tick(CPU_PROFILING);
-        write_seqlock(&xtime_lock);
-        do_timer(1);
-        write_sequnlock(&xtime_lock);
+        xtime_update(1);
         update_process_times(user_mode(get_irq_regs()));
 }
 
diff --git a/arch/h8300/kernel/timer/timer8.c b/arch/h8300/kernel/timer/timer8.c
index 3946c0fa8374..7a1533fad47d 100644
--- a/arch/h8300/kernel/timer/timer8.c
+++ b/arch/h8300/kernel/timer/timer8.c
@@ -61,7 +61,7 @@
 
 /*
  * timer_interrupt() needs to keep up the real-time clock,
- * as well as call the "do_timer()" routine every clocktick
+ * as well as call the "xtime_update()" routine every clocktick
  */
 
 static irqreturn_t timer_interrupt(int irq, void *dev_id)