2010-06-05 15:40:49

by Andres Salomon

Subject: [PATCH] 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 <[email protected]>
---
arch/x86/include/asm/pgtable_32_types.h | 2 +-
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 5f52bb0..1b4f19e 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

--
1.5.6.5

2010-06-08 01:01:25

by Andres Salomon

Subject: [tip:x86/urgent] x86: use __ASSEMBLY__ rather than __ASSEMBLER__

Commit-ID: fc4ac7a5f5996712d9123ae4850948c640edb315
Gitweb: http://git.kernel.org/tip/fc4ac7a5f5996712d9123ae4850948c640edb315
Author: Andres Salomon <[email protected]>
AuthorDate: Sat, 5 Jun 2010 11:40:42 -0400
Committer: H. Peter Anvin <[email protected]>
CommitDate: Mon, 7 Jun 2010 17:27:11 -0700

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 <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: H. Peter Anvin <[email protected]>
---
arch/x86/include/asm/pgtable_32_types.h | 2 +-
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 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