Commit 87673af0 authored by David Mosberger's avatar David Mosberger

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

parent fc051025
...@@ -335,7 +335,8 @@ handle_fpu_swa (int fp_fault, struct pt_regs *regs, unsigned long isr) ...@@ -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)) { if ((fpu_swa_count < 4) && !(current->thread.flags & IA64_THREAD_FPEMU_NOPRINT)) {
last_time = jiffies; last_time = jiffies;
++fpu_swa_count; ++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); current->comm, current->pid, regs->cr_iip + ia64_psr(regs)->ri, isr);
} }
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
* David Mosberger-Tang <davidm@hpl.hp.com> * David Mosberger-Tang <davidm@hpl.hp.com>
*/ */
#include <linux/compiler.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/sched.h> #include <linux/sched.h>
...@@ -57,9 +58,10 @@ ...@@ -57,9 +58,10 @@
* address TASK_SIZE is never valid. We also need to make sure that the address doesn't * 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. * point inside the virtually mapped linear page table.
*/ */
#define __access_ok(addr,size,segment) (((unsigned long) (addr)) <= (segment).seg \ #define __access_ok(addr,size,segment) \
&& ((segment).seg == KERNEL_DS.seg \ likely(((unsigned long) (addr)) <= (segment).seg \
|| REGION_OFFSET((unsigned long) (addr)) < RGN_MAP_LIMIT)) && ((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()) #define access_ok(type,addr,size) __access_ok((addr),(size),get_fs())
static inline int static inline int
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment