Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

[linux-2.6] / include / asm-ppc64 / processor.h

diff --git a/include/asm-ppc64/processor.h b/include/asm-ppc64/processor.h
index eb33d33cfd6d30982afb1712134b4b5e917026c3..0035efe2db2ba7591fce0f6be861e6f23b7ecfd6 100644 (file)
--- a/include/asm-ppc64/processor.h
+++ b/include/asm-ppc64/processor.h
@@ -542,10 +542,6 @@ extern struct task_struct *last_task_used_altivec;
 #define TASK_SIZE (test_thread_flag(TIF_32BIT) ? \
                TASK_SIZE_USER32 : TASK_SIZE_USER64)
 
-/* We can't actually tell the TASK_SIZE given just the mm, but default
- * to the 64-bit case to make sure that enough gets cleaned up. */
-#define MM_VM_SIZE(mm) TASK_SIZE_USER64
-
 /* This decides where the kernel will search for a free chunk of vm
  * space during mmap's.
  */
@@ -642,11 +638,17 @@ static inline unsigned long __pack_fe01(unsigned int fpmode)
 
 static inline void prefetch(const void *x)
 {
+       if (unlikely(!x))
+               return;
+
        __asm__ __volatile__ ("dcbt 0,%0" : : "r" (x));
 }
 
 static inline void prefetchw(const void *x)
 {
+       if (unlikely(!x))
+               return;
+
        __asm__ __volatile__ ("dcbtst 0,%0" : : "r" (x));
 }