diff --git a/[refs] b/[refs]
index 700a39cbe6e5..03c4ddfae007 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afa37394d6bfc91907b0e08c902d36d848232b99
+refs/heads/master: 869e5101728fe2f307f0a3c3cf599c184f81f0ee
diff --git a/trunk/arch/parisc/kernel/sys_parisc.c b/trunk/arch/parisc/kernel/sys_parisc.c
index 512642d8f707..6fed0803c593 100644
--- a/trunk/arch/parisc/kernel/sys_parisc.c
+++ b/trunk/arch/parisc/kernel/sys_parisc.c
@@ -106,6 +106,11 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
 {
 	if (len > TASK_SIZE)
 		return -ENOMEM;
+	/* Might want to check for cache aliasing issues for MAP_FIXED case
+	 * like ARM or MIPS ??? --BenH.
+	 */
+	if (flags & MAP_FIXED)
+		return addr;
 	if (!addr)
 		addr = TASK_UNMAPPED_BASE;