[PATCH] Import missing linkage.h from Linux 3.19-rc6

[Sascha Hauer]

On Tue, Feb 03, 2015 at 03:14:41PM +0900, Masahiro Yamada wrote:
> Hi Sascha,
> 
> 
> On Thu, 29 Jan 2015 09:54:31 +0100
> Sascha Hauer <s.hauer at pengutronix.de> wrote:
> 
> > > +
> > > diff --git a/arch/mips/include/asm/linkage.h b/arch/mips/include/asm/linkage.h
> > > new file mode 100644
> > > index 0000000..2767dda
> > > --- /dev/null
> > > +++ b/arch/mips/include/asm/linkage.h
> > > @@ -0,0 +1,13 @@
> > > +#ifndef __ASM_LINKAGE_H
> > > +#define __ASM_LINKAGE_H
> > > +
> > > +#ifdef __ASSEMBLY__
> > > +#include <asm/asm.h>
> > > +#endif
> > > +
> > > +#define __weak __attribute__((weak))
> > > +#define cond_syscall(x) asm(".weak\t" #x "\n" #x "\t=\tsys_ni_syscall")
> > > +#define SYSCALL_ALIAS(alias, name)					\
> > > +	asm ( #alias " = " #name "\n\t.globl " #alias)
> > 
> > __weak is already defined in compiler-gcc.h and should probably be taken
> > from there. The syscall things are unused in barebox, so better make
> > this file just empty?
> 
> 
> OK, will do.
> 
> 
> 
> > > +
> > > +#endif
> > > diff --git a/arch/nios2/include/asm/linkage.h b/arch/nios2/include/asm/linkage.h
> > > new file mode 100644
> > > index 0000000..e0c6dec
> > > --- /dev/null
> > > +++ b/arch/nios2/include/asm/linkage.h
> > > @@ -0,0 +1,25 @@
> > > +/*
> > > + * Copyright (C) 2009 Thomas Chou <thomas at wytron.com.tw>
> > > + *
> > > + * All rights reserved.
> > > + *
> > > + * 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, GOOD TITLE or
> > > + * NON INFRINGEMENT.  See the GNU General Public License for more
> > > + * details.
> > > + */
> > > +
> > > +#ifndef _ASM_NIOS2_LINKAGE_H
> > > +#define _ASM_NIOS2_LINKAGE_H
> > > +
> > > +/* This file is required by include/linux/linkage.h */
> > > +#define __ALIGN .align 4
> > > +#define __ALIGN_STR ".align 4"
> > 
> > Use default instead? The nios2 kernel file doesn't give a clue why this
> > should be different from the default.
> 
> I have no idea.
> If the reason is not clear, why don't we keep it as is for safety?

This __ALIGN_STR and __ALIGN macros seem to be a leftover from acient
times. In the Kernel there are only a few users of __ALIGN_STR:

./drivers/pnp/pnpbios/bioscalls.c:43:   __ALIGN_STR "\n"
./arch/m68k/kernel/vectors.c:43:    __ALIGN_STR "\n"
./arch/m68k/amiga/config.c:583:         "       " __ALIGN_STR "\n"
./arch/m68k/atari/ataints.c:79:__ALIGN_STR "\n\t"

The second argument to the .align directive is the padding value. The
standard architecture independent value in include/linux/linkage.h is
0x90:

./include/linux/linkage.h:45:#define __ALIGN            .align 4,0x90

0x90 is the x86 assembly for the nop instruction. I doubt that this
makes sense on any other architecture.

All this is unused in barebox, so I think we should drop this rather
than blindly copying from Linux.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |