Merge branch 'master' into upstream

3 files changed, 8 insertions, 6 deletions

diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c
index b5195be628..e1a1b11473 100644
--- a/arch/ia64/hp/sim/simeth.c
+++ b/arch/ia64/hp/sim/simeth.c
@@ -320,7 +320,7 @@ simeth_device_event(struct notifier_block *this,unsigned long event, void *ptr)
         }
 
         printk(KERN_INFO "simeth_device_event: %s ipaddr=0x%x\n",
-               dev->name, htonl(ifa->ifa_local));
+               dev->name, ntohl(ifa->ifa_local));
 
         /*
          * XXX Fix me
@@ -331,7 +331,7 @@ simeth_device_event(struct notifier_block *this,unsigned long event, void *ptr)
         local = dev->priv;
         /* now do it for real */
         r = event == NETDEV_UP ?
-                netdev_attach(local->simfd, dev->irq, htonl(ifa->ifa_local)):
+                netdev_attach(local->simfd, dev->irq, ntohl(ifa->ifa_local)):
                 netdev_detach(local->simfd);
 
         printk(KERN_INFO "simeth: netdev_attach/detach: event=%s ->%d\n",
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index 6928ef0d64..16262687a1 100644
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -78,7 +78,7 @@ timer_interrupt (int irq, void *dev_id, struct pt_regs *regs)
                          * xtime_lock.
                          */
                         write_seqlock(&xtime_lock);
-                        do_timer(regs);
+                        do_timer(1);
                         local_cpu_data->itm_next = new_itm;
                         write_sequnlock(&xtime_lock);
                 } else
diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
index 14ef7cceb2..59f3ab9376 100644
--- a/arch/ia64/mm/fault.c
+++ b/arch/ia64/mm/fault.c
@@ -146,9 +146,11 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
 #               error File is out of sync with <linux/mm.h>.  Please update.
 #       endif
 
+        if (((isr >> IA64_ISR_R_BIT) & 1UL) && (!(vma->vm_flags & (VM_READ | VM_WRITE))))
+                goto bad_area;
+
         mask = (  (((isr >> IA64_ISR_X_BIT) & 1UL) << VM_EXEC_BIT)
-                | (((isr >> IA64_ISR_W_BIT) & 1UL) << VM_WRITE_BIT)
-                | (((isr >> IA64_ISR_R_BIT) & 1UL) << VM_READ_BIT));
+                | (((isr >> IA64_ISR_W_BIT) & 1UL) << VM_WRITE_BIT));
 
         if ((vma->vm_flags & mask) != mask)
                 goto bad_area;
@@ -278,7 +280,7 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
 
   out_of_memory:
         up_read(&mm->mmap_sem);
-        if (current->pid == 1) {
+        if (is_init(current)) {
                 yield();
                 down_read(&mm->mmap_sem);
                 goto survive;