linkage.h: move from blackfin to common includes

1. Add linkage.h support from blackfin to common include,
   which is a reduced version from Linux.
2. Add architecture part support of linkage.h into blackfin
3. Fix include path of in blackfin related to linkage.h
   due to header file movement.

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/arch/blackfin/cpu/cache.S b/arch/blackfin/cpu/cache.S
index 6ed655a674f52c8c3297c9cbb7db21c02c3d3f9c..5ca9e91d3f12ed015ca2cd12a5ce87b34c9d2b3f 100644 (file)
--- a/arch/blackfin/cpu/cache.S
+++ b/arch/blackfin/cpu/cache.S
@@ -8,8 +8,8 @@
  * Licensed under the GPL-2 or later.
  */
 
-#include <asm/linkage.h>
 #include <config.h>
+#include <linux/linkage.h>
 #include <asm/blackfin.h>
 
 .text

diff --git a/arch/blackfin/include/asm/blackfin_local.h b/arch/blackfin/include/asm/blackfin_local.h
index 71207b697ac62e8bca3026a8f9aa66c3ea409a32..49d0c9ec3aabc2a2ccc480da356a37c000ae061d 100644 (file)
--- a/arch/blackfin/include/asm/blackfin_local.h
+++ b/arch/blackfin/include/asm/blackfin_local.h
@@ -48,7 +48,7 @@
 #define L1_CACHE_SHIFT 5
 #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
 
-#include <asm/linkage.h>
+#include <linux/linkage.h>
 #include <asm/cache.h>
 
 #ifndef __ASSEMBLY__

diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
index 482e4b52b63cebf3904fe41d59166c6bf83e5d86..568885a2c2862bc12699207515650d5342ddb6fd 100644 (file)
--- a/arch/blackfin/include/asm/cache.h
+++ b/arch/blackfin/include/asm/cache.h
@@ -7,7 +7,7 @@
 #ifndef __ARCH_BLACKFIN_CACHE_H
 #define __ARCH_BLACKFIN_CACHE_H
 
-#include <asm/linkage.h>       /* for asmlinkage */
+#include <linux/linkage.h>     /* for asmlinkage */
 
 /*
  * Bytes per L1 cache line

diff --git a/arch/blackfin/include/asm/linkage.h b/arch/blackfin/include/asm/linkage.h
index fbb497c7bdcf60031af1c861418289547ba92560..6d4493a6c529a14fc7a4e084662e51018d868151 100644 (file)
--- a/arch/blackfin/include/asm/linkage.h
+++ b/arch/blackfin/include/asm/linkage.h
@@ -22,53 +22,7 @@
  * MA 02110-1301 USA
  */
 
-#ifndef _LINUX_LINKAGE_H
-#define _LINUX_LINKAGE_H
-
-#include <linux/config.h>
-
-#ifdef __cplusplus
-#define CPP_ASMLINKAGE         extern "C"
-#else
-#define CPP_ASMLINKAGE
-#endif
-
-#define asmlinkage CPP_ASMLINKAGE
-
-#define SYMBOL_NAME_STR(X)     #X
-#define SYMBOL_NAME(X)         X
-#ifdef __STDC__
-#define SYMBOL_NAME_LABEL(X)   X##:
-#else
-#define SYMBOL_NAME_LABEL(X)   X:
-#endif
-
-#define __ALIGN .align         4
-#define __ALIGN_STR            ".align 4"
-
-#ifdef __ASSEMBLY__
-
-#define ALIGN                  __ALIGN
-#define ALIGN_STR              __ALIGN_STR
-
-#define LENTRY(name) \
-       ALIGN; \
-       SYMBOL_NAME_LABEL(name)
-
-#define ENTRY(name) \
-       .globl SYMBOL_NAME(name); \
-       LENTRY(name)
-#endif
-
-#ifndef END
-#define END(name) \
-       .size name, .-name
-#endif
-
-#ifndef ENDPROC
-#define ENDPROC(name) \
-       .type name, @function; \
-       END(name)
-#endif
+#ifndef __ASM_LINKAGE_H
+#define __ASM_LINKAGE_H
 
 #endif

diff --git a/arch/blackfin/lib/__kgdb.S b/arch/blackfin/lib/__kgdb.S
index cba4179d3efbf350661c4033f7be4063506dee38..4ccde8f104e1118cfab413a0c5f6f5bb5a2ce205 100644 (file)
--- a/arch/blackfin/lib/__kgdb.S
+++ b/arch/blackfin/lib/__kgdb.S
@@ -1,5 +1,5 @@
 
-#include <asm/linkage.h>
+#include <linux/linkage.h>
 
 /* save stack context for non-local goto
  * int kgdb_setjmp(long *buf)

diff --git a/arch/blackfin/lib/outs.S b/arch/blackfin/lib/outs.S
index 253d4c3e417b47a2a92e503bec896b0d4a9d9457..39d5332615ab333b35a61c3c2f6c5e45d6d96959 100644 (file)
--- a/arch/blackfin/lib/outs.S
+++ b/arch/blackfin/lib/outs.S
@@ -8,7 +8,7 @@
  * Licensed under the GPL-2.
  */
 
-#include <asm/linkage.h>
+#include <linux/linkage.h>
 
 .align 2
 

diff --git a/include/linux/linkage.h b/include/linux/linkage.h
new file mode 100644 (file)
index 0000000..ed4cf6c
--- /dev/null
+++ b/include/linux/linkage.h
@@ -0,0 +1,76 @@
+/*
+ * U-boot - linkage.h
+ *
+ * Copyright (c) 2005-2007 Analog Devices Inc.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#ifndef _LINUX_LINKAGE_H
+#define _LINUX_LINKAGE_H
+
+#include <asm/linkage.h>
+#include <linux/config.h>
+
+#ifdef __cplusplus
+#define CPP_ASMLINKAGE         extern "C"
+#else
+#define CPP_ASMLINKAGE
+#endif
+
+#define asmlinkage CPP_ASMLINKAGE
+
+#define SYMBOL_NAME_STR(X)     #X
+#define SYMBOL_NAME(X)         X
+#ifdef __STDC__
+#define SYMBOL_NAME_LABEL(X)   X##:
+#else
+#define SYMBOL_NAME_LABEL(X)   X:
+#endif
+
+#define __ALIGN .align         4
+#define __ALIGN_STR            ".align 4"
+
+#ifdef __ASSEMBLY__
+
+#define ALIGN                  __ALIGN
+#define ALIGN_STR              __ALIGN_STR
+
+#define LENTRY(name) \
+       ALIGN; \
+       SYMBOL_NAME_LABEL(name)
+
+#define ENTRY(name) \
+       .globl SYMBOL_NAME(name); \
+       LENTRY(name)
+
+#ifndef END
+#define END(name) \
+       .size name, .-name
+#endif
+
+#ifndef ENDPROC
+#define ENDPROC(name) \
+       .type name, @function; \
+       END(name)
+#endif
+
+#endif
+
+#endif