summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRusty Russell2006-09-26 08:32:29 +0200
committerLinus Torvalds2006-09-26 17:48:56 +0200
commit673eae8230a192f07b8715b872d6925521e9738d (patch)
tree2917c765594015ebfad00bb4fc1feef41286ca1a
parent[PATCH] x86: enable VMSPLIT for highmem kernels (diff)
downloadkernel-qcow2-linux-673eae8230a192f07b8715b872d6925521e9738d.tar.gz
kernel-qcow2-linux-673eae8230a192f07b8715b872d6925521e9738d.tar.xz
kernel-qcow2-linux-673eae8230a192f07b8715b872d6925521e9738d.zip
[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>
-rw-r--r--include/asm-generic/pgtable.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
index c2059a3a0621..349260cd86ed 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.