* [PATCH] x86: use __ASSEMBLY__ rather than __ASSEMBLER__
@ 2010-06-05 15:40 Andres Salomon
2010-06-08 1:01 ` [tip:x86/urgent] " tip-bot for Andres Salomon
0 siblings, 1 reply; 2+ messages in thread
From: Andres Salomon @ 2010-06-05 15:40 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, tglx, mingo, hpa, x86
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>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip:x86/urgent] x86: use __ASSEMBLY__ rather than __ASSEMBLER__
2010-06-05 15:40 [PATCH] x86: use __ASSEMBLY__ rather than __ASSEMBLER__ Andres Salomon
@ 2010-06-08 1:01 ` tip-bot for Andres Salomon
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Andres Salomon @ 2010-06-08 1:01 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, dilinger, tglx, hpa
Commit-ID: fc4ac7a5f5996712d9123ae4850948c640edb315
Gitweb: http://git.kernel.org/tip/fc4ac7a5f5996712d9123ae4850948c640edb315
Author: Andres Salomon <dilinger@queued.net>
AuthorDate: Sat, 5 Jun 2010 11:40:42 -0400
Committer: H. Peter Anvin <hpa@linux.intel.com>
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 <dilinger@queued.net>
LKML-Reference: <20100605114042.35ac69c1@dev.queued.net>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-06-08 1:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-05 15:40 [PATCH] x86: use __ASSEMBLY__ rather than __ASSEMBLER__ Andres Salomon
2010-06-08 1:01 ` [tip:x86/urgent] " tip-bot for Andres Salomon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox