From: Rusty Russell <rusty@rustcorp.com.au>
Date: Tue, 26 Sep 2006 06:32:29 +0000 (-0700)
Subject: [PATCH] x86: trivial pgtable.h __ASSEMBLY__ move
X-Git-Tag: v2.6.19-rc1~1125
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=673eae8230a192f07b8715b872d6925521e9738d;p=linux-2.6-omap-h63xx.git

[PATCH] x86: trivial pgtable.h __ASSEMBLY__ move

Parsing generic pgtable.h in assembler is simply crazy.  None of this file is
needed in assembler code, and C inline functions and structures routine break
one or more different compiles.

Signed-off-by: Zachary Amsden <zach@vmware.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
index c2059a3a062..349260cd86e 100644
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
@@ -1,6 +1,8 @@
 #ifndef _ASM_GENERIC_PGTABLE_H
 #define _ASM_GENERIC_PGTABLE_H
 
+#ifndef __ASSEMBLY__
+
 #ifndef __HAVE_ARCH_PTEP_ESTABLISH
 /*
  * Establish a new mapping:
@@ -188,7 +190,6 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addres
 })
 #endif
 
-#ifndef __ASSEMBLY__
 /*
  * When walking page tables, we usually want to skip any p?d_none entries;
  * and any p?d_bad entries - reporting the error before resetting to none.