ia64: Mark access_ok() as likely to succeed (as is done in x86 tree).

diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c
index 522d5b3a4bf740510802549de50884ce2b8254a7..676b15166aa97a0ebe5e0e5cbf61a5ca09c486f4 100644 (file)
--- a/arch/ia64/kernel/traps.c
+++ b/arch/ia64/kernel/traps.c
@@ -335,7 +335,8 @@ handle_fpu_swa (int fp_fault, struct pt_regs *regs, unsigned long isr)
        if ((fpu_swa_count < 4) && !(current->thread.flags & IA64_THREAD_FPEMU_NOPRINT)) {
                last_time = jiffies;
                ++fpu_swa_count;
-               printk(KERN_WARNING "%s(%d): floating-point assist fault at ip %016lx, isr %016lx\n",
+               printk(KERN_WARNING
+                      "%s(%d): floating-point assist fault at ip %016lx, isr %016lx\n",
                       current->comm, current->pid, regs->cr_iip + ia64_psr(regs)->ri, isr);
        }
 

diff --git a/include/asm-ia64/uaccess.h b/include/asm-ia64/uaccess.h
index bd0a7c26a0ac7c30bce70cfdfadb57ac62179fb6..9aa49df402473f68ad7f154656570b2e14472514 100644 (file)
--- a/include/asm-ia64/uaccess.h
+++ b/include/asm-ia64/uaccess.h
@@ -30,6 +30,7 @@
  *     David Mosberger-Tang <davidm@hpl.hp.com>
  */
 
+#include <linux/compiler.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
 
@@ -57,9 +58,10 @@
  * address TASK_SIZE is never valid.  We also need to make sure that the address doesn't
  * point inside the virtually mapped linear page table.
  */
-#define __access_ok(addr,size,segment) (((unsigned long) (addr)) <= (segment).seg      \
-        && ((segment).seg == KERNEL_DS.seg                                             \
-            || REGION_OFFSET((unsigned long) (addr)) < RGN_MAP_LIMIT))
+#define __access_ok(addr,size,segment)                                         \
+       likely(((unsigned long) (addr)) <= (segment).seg                        \
+              && ((segment).seg == KERNEL_DS.seg                               \
+                  || REGION_OFFSET((unsigned long) (addr)) < RGN_MAP_LIMIT))
 #define access_ok(type,addr,size)      __access_ok((addr),(size),get_fs())
 
 static inline int