lkml.org 
[lkml]   [2008]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] reorganize <linux/linkage.h>
Commit 54a015104136974262afa4b8ddd943ea70dec8a2 adds some new magic
asmlinkage_protect gizmo, but that can only be used from C code, not
assembly. Protect relevant bits of <linux/linkage.h> with !__ASSEMBLY__
so this can't leak into assembly source.

Fixes a couple build errors on my boxes,
AS arch/parisc/kernel/pacache.o
In file included from arch/parisc/kernel/pacache.S:40:
include/linux/linkage.h:34: error: syntax error in macro parameter list
make[1]: *** [arch/parisc/kernel/pacache.o] Error 1

(__ALIGN gets used in both kernel and assembly context, so make sure it
is outside of the ifdeffery.)

Signed-off-by: Kyle McMartin <kmcmartin@redhat.com>
---
diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index b163c5c..e848f74 100644
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -3,6 +3,13 @@

#include <asm/linkage.h>

+#ifndef __ALIGN
+#define __ALIGN .align 4,0x90
+#define __ALIGN_STR ".align 4,0x90"
+#endif
+
+#if !defined(__ASSEMBLY__)
+
#ifdef __cplusplus
#define CPP_ASMLINKAGE extern "C"
#else
@@ -34,12 +41,11 @@
# define asmlinkage_protect(n, ret, args...) do { } while (0)
#endif

-#ifndef __ALIGN
-#define __ALIGN .align 4,0x90
-#define __ALIGN_STR ".align 4,0x90"
-#endif
+#define NORET_TYPE /**/
+#define ATTRIB_NORET __attribute__((noreturn))
+#define NORET_AND noreturn,

-#ifdef __ASSEMBLY__
+#else

#define ALIGN __ALIGN
#define ALIGN_STR __ALIGN_STR
@@ -80,10 +86,6 @@
END(name)
#endif

-#endif
-
-#define NORET_TYPE /**/
-#define ATTRIB_NORET __attribute__((noreturn))
-#define NORET_AND noreturn,
+#endif /*__ASSEMBLY__*/

#endif

\
 
 \ /
  Last update: 2008-04-11 07:03    [W:0.258 / U:0.068 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site