summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@queued.net>2010-06-05 11:40:42 -0400
committerH. Peter Anvin <hpa@linux.intel.com>2010-06-07 17:27:11 -0700
commitfc4ac7a5f5996712d9123ae4850948c640edb315 (patch)
tree78a8607ecdb6537d7d34ad771152c48cc8f5b581 /arch
parente44a21b7268a022c7749f521c06214145bd161e4 (diff)
downloadlinux-stable-fc4ac7a5f5996712d9123ae4850948c640edb315.tar.gz
linux-stable-fc4ac7a5f5996712d9123ae4850948c640edb315.tar.bz2
linux-stable-fc4ac7a5f5996712d9123ae4850948c640edb315.zip
x86: use __ASSEMBLY__ rather than __ASSEMBLER__
As Ingo pointed out in a separate patch, we should be using __ASSEMBLY__. Make that the case in pgtable headers. Signed-off-by: Andres Salomon <dilinger@queued.net> LKML-Reference: <20100605114042.35ac69c1@dev.queued.net> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/include/asm/pgtable_32_types.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
index 5e67c1532314..ed5903be26fe 100644
--- a/arch/x86/include/asm/pgtable_32_types.h
+++ b/arch/x86/include/asm/pgtable_32_types.h
@@ -26,7 +26,7 @@
*/
#define VMALLOC_OFFSET (8 * 1024 * 1024)
-#ifndef __ASSEMBLER__
+#ifndef __ASSEMBLY__
extern bool __vmalloc_start_set; /* set once high_memory is set */
#endif