diff mbox

[U-Boot,1/3] linkage.h: move from blackfin to common includes

Message ID 1322637827-4126-1-git-send-email-macpaul@andestech.com
State Superseded
Delegated to: Macpaul Lin
Headers show

Commit Message

Macpaul Lin Nov. 30, 2011, 7:23 a.m. UTC 
Add linkage.h support from blackfin to common include,
which is a reduced version from Linux.

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
---
 arch/blackfin/include/asm/linkage.h |   74 -----------------------------------
 include/linux/linkage.h             |   72 ++++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 74 deletions(-)
 delete mode 100644 arch/blackfin/include/asm/linkage.h
 create mode 100644 include/linux/linkage.h

Comments

Mike Frysinger Nov. 30, 2011, 4:25 p.m. UTC | #1 
On Wednesday 30 November 2011 02:23:45 Macpaul Lin wrote:
> Add linkage.h support from blackfin to common include,
> which is a reduced version from Linux.

since applying any of these patches alone will break things, you'll have to 
squash them into one.  otherwise git bisect won't work.

otherwise, it looks good to me :)
-mike
Fabio Estevam Jan. 11, 2012, 2:05 a.m. UTC | #2 
On Wed, Nov 30, 2011 at 5:23 AM, Macpaul Lin <macpaul@andestech.com> wrote:
> Add linkage.h support from blackfin to common include,
> which is a reduced version from Linux.
>
> Signed-off-by: Macpaul Lin <macpaul@andestech.com>
> ---
>  arch/blackfin/include/asm/linkage.h |   74 -----------------------------------
>  include/linux/linkage.h             |   72 ++++++++++++++++++++++++++++++++++
>  2 files changed, 72 insertions(+), 74 deletions(-)
>  delete mode 100644 arch/blackfin/include/asm/linkage.h
>  create mode 100644 include/linux/linkage.h

You can use the -M git option to properly do the filename change.

Regards,

Fabio Estevam
Mike Frysinger Jan. 11, 2012, 2:21 a.m. UTC | #3 
On Tuesday 10 January 2012 21:05:35 Fabio Estevam wrote:
> On Wed, Nov 30, 2011 at 5:23 AM, Macpaul Lin <macpaul@andestech.com> wrote:
> > Add linkage.h support from blackfin to common include,
> > which is a reduced version from Linux.
> > 
> > Signed-off-by: Macpaul Lin <macpaul@andestech.com>
> > ---
> >  arch/blackfin/include/asm/linkage.h |   74
> > ----------------------------------- include/linux/linkage.h            
> > |   72 ++++++++++++++++++++++++++++++++++ 2 files changed, 72
> > insertions(+), 74 deletions(-)
> >  delete mode 100644 arch/blackfin/include/asm/linkage.h
> >  create mode 100644 include/linux/linkage.h
> 
> You can use the -M git option to properly do the filename change.

the -M option is display of the changeset only ... it doesn't affect what gets 
committed/merged.  but using -C/-M when sending patches would be nice as it's 
easier to review.
-mike
diff mbox

Patch

diff --git a/arch/blackfin/include/asm/linkage.h b/arch/blackfin/include/asm/linkage.h
deleted file mode 100644
index fbb497c..0000000
--- a/arch/blackfin/include/asm/linkage.h
+++ /dev/null
@@ -1,74 +0,0 @@ 
-/*
- * 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 <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
-
-#endif
diff --git a/include/linux/linkage.h b/include/linux/linkage.h
new file mode 100644
index 0000000..1081dad
--- /dev/null
+++ b/include/linux/linkage.h
@@ -0,0 +1,72 @@ 
+/*
+ * 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
+
+#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
+
+#endif