From: Andres Salomon <dilinger@queued.net>
Date: Sat, 5 Jun 2010 15:40:42 +0000 (-0400)
Subject: x86: use __ASSEMBLY__ rather than __ASSEMBLER__
X-Git-Tag: v2.6.35-rc4~50^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fc4ac7a5f5996712d9123ae4850948c640edb315;p=platform%2Fkernel%2Flinux-3.10.git

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>
---

diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
index 5e67c15..ed5903b 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