From: Andres Salomon Date: Sat, 5 Jun 2010 15:40:42 +0000 (-0400) Subject: x86: use __ASSEMBLY__ rather than __ASSEMBLER__ X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fc4ac7a5f5996712d9123ae4850948c640edb315;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.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 LKML-Reference: <20100605114042.35ac69c1@dev.queued.net> Signed-off-by: H. Peter Anvin --- diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h index 5e67c153231..ed5903be26f 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