From 75f4efb6a5bc4c448a13701eb1f1200b28d8d05f Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Mon, 25 Sep 2006 23:32:29 -0700
Subject: [PATCH] --- yaml --- r: 35665 b: refs/heads/master c:
 673eae8230a192f07b8715b872d6925521e9738d h: refs/heads/master i:   35663:
 c4c0e4a9fed66041b06243516f60829886b474d6 v: v3

---
 [refs]                              | 2 +-
 trunk/include/asm-generic/pgtable.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5809a0a880ce..8018a7bf1b2d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 753b9f86e7aef76c2beda32668ce528f90cb1733
+refs/heads/master: 673eae8230a192f07b8715b872d6925521e9738d
diff --git a/trunk/include/asm-generic/pgtable.h b/trunk/include/asm-generic/pgtable.h
index c2059a3a0621..349260cd86ed 100644
--- a/trunk/include/asm-generic/pgtable.h
+++ b/trunk/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.