lkml.org 
[lkml]   [2008]   [Jun]   [22]   [last100]   RSS Feed
Views: [more markup]  [less markup]  [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
DateSun, 22 Jun 2008 09:29:35 -0700 (PDT)
FromLinus Torvalds <>
SubjectRe: Linux 2.6.26-rc7

On Sun, 22 Jun 2008, Jeff Chua wrote:

> On Sat, Jun 21, 2008 at 7:42 AM, Linus Torvalds
> <torvalds@linux-foundation.org> wrote:
> > Another week, another -rc.
> > Linus Torvalds (4):
> >      Reinstate ZERO_PAGE optimization in 'get_user_pages()' and fix XIP
> 
> [89f5b7da2a6bad2e84670422ab8192382a5aeb9f]
> 
> This broke vmware 6.0.4.

Hmm. Can you see which part of it broke? Was it the "fix XIP" part ot the 
ZERO_PAGE part? The easiest way to test is to apply this patch, and see 
(it just disables the XIP part of fix)

		Linus
---
 mm/memory.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/mm/memory.c b/mm/memory.c
index 9aefaae..9056132 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1023,8 +1023,12 @@ out:
 	return page;
 
 bad_page:
+#if 0
 	pte_unmap_unlock(ptep, ptl);
 	return ERR_PTR(-EFAULT);
+#else
+	return NULL;
+#endif
 
 no_page:
 	pte_unmap_unlock(ptep, ptl);

\
 
 \ /
  Last update: 2008-06-22 18:33    [from the cache]
©2003-2008