On (01/06/07 10:00), Andrew Morton didst pronounce:
> On Fri, 1 Jun 2007 17:42:04 +0100 [EMAIL PROTECTED] (Mel Gorman) wrote:
> 
> > mm/memory.c: In function `do_wp_page':
> > mm/memory.c:1700: error: parse error before "__changed"
> > mm/memory.c:1700: error: parse error before ')' token
> > mm/memory.c:1704: error: parse error before "ret"
> 
> this?
> 
> --- 
> a/include/asm-ia64/pgtable.h~rework-ptep_set_access_flags-and-fix-sun4c-fix
> +++ a/include/asm-ia64/pgtable.h
> @@ -546,7 +546,7 @@ extern void lazy_mmu_prot_update (pte_t 
>  # define ptep_set_access_flags(__vma, __addr, __ptep, __entry, 
> __safely_writable) \
>  ({                                                                           
> \
>       int __changed = !pte_same(*(__ptep), __entry);                          
> \
> -     if (__changed) {                                                        
> \
> +     if (__changed)                                                  \
>               ptep_establish(__vma, __addr, __ptep, __entry)                  
> \
>       __changed;                                                              
> \
>  })

Fails with

mm/memory.c: In function `do_wp_page':
mm/memory.c:1700: error: parse error before "__changed"
mm/memory.c: In function `handle_pte_fault':
mm/memory.c:2544: error: parse error before "__changed"

Am currently testing the following;

diff -rup -X /usr/src/patchset-0.6/bin//dontdiff 
linux-2.6.22-rc3-mm1-clean/include/asm-ia64/pgtable.h 
linux-2.6.22-rc3-mm1-ia64fix/include/asm-ia64/pgtable.h
--- linux-2.6.22-rc3-mm1-clean/include/asm-ia64/pgtable.h       2007-06-01 
09:24:39.000000000 +0100
+++ linux-2.6.22-rc3-mm1-ia64fix/include/asm-ia64/pgtable.h     2007-06-01 
19:44:48.000000000 +0100
@@ -546,8 +546,8 @@ extern void lazy_mmu_prot_update (pte_t 
 # define ptep_set_access_flags(__vma, __addr, __ptep, __entry, 
__safely_writable) \
 ({                                                                             
\
        int __changed = !pte_same(*(__ptep), __entry);                          
\
-       if (__changed) {                                                        
\
-               ptep_establish(__vma, __addr, __ptep, __entry)                  
\
+       if (__changed)                                                  \
+               ptep_establish(__vma, __addr, __ptep, __entry);                 
\
        __changed;                                                              
\
 })
 #endif

-- 
-- 
Mel Gorman
Part-time Phd Student                          Linux Technology Center
University of Limerick                         IBM Dublin Software Lab
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to