mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
126de6b20b
Al's commit e1b5bb6d12 ("consolidate cond_syscall and SYSCALL_ALIAS
declarations") broke the build on blackfin and metag due to the
following code:
#ifndef SYMBOL_NAME
#ifdef CONFIG_SYMBOL_PREFIX
#define SYMBOL_NAME(x) CONFIG_SYMBOL_PREFIX ## x
#else
#define SYMBOL_NAME(x) x
#endif
#endif
#define __SYMBOL_NAME(x) __stringify(SYMBOL_NAME(x))
__stringify literally stringifies CONFIG_SYMBOL_PREFIX ##x, so you get
lines like this in kernel/sys_ni.s:
.weak CONFIG_SYMBOL_PREFIXsys_quotactl
.set CONFIG_SYMBOL_PREFIXsys_quotactl,CONFIG_SYMBOL_PREFIXsys_ni_syscall
The patches in Rusty's modules-next tree such as "CONFIG_SYMBOL_PREFIX:
cleanup." cleans up the whole mess around symbol prefixes, so this patch
just attempts to fix the build in the meantime.
The intermediate definition of SYMBOL_NAME above isn't used and is
incorrect when CONFIG_SYMBOL_PREFIX is defined as CONFIG_SYMBOL_PREFIX
is a quoted string literal, so define __SYMBOL_NAME directly depending
on CONFIG_SYMBOL_PREFIX.
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Mea-culpa-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: uclinux-dist-devel@blackfin.uclinux.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
109 lines
2.5 KiB
C
109 lines
2.5 KiB
C
#ifndef _LINUX_LINKAGE_H
|
|
#define _LINUX_LINKAGE_H
|
|
|
|
#include <linux/compiler.h>
|
|
#include <linux/stringify.h>
|
|
#include <asm/linkage.h>
|
|
|
|
#ifdef __cplusplus
|
|
#define CPP_ASMLINKAGE extern "C"
|
|
#else
|
|
#define CPP_ASMLINKAGE
|
|
#endif
|
|
|
|
#ifndef asmlinkage
|
|
#define asmlinkage CPP_ASMLINKAGE
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYMBOL_PREFIX
|
|
#define __SYMBOL_NAME(x) CONFIG_SYMBOL_PREFIX __stringify(x)
|
|
#else
|
|
#define __SYMBOL_NAME(x) __stringify(x)
|
|
#endif
|
|
|
|
#ifndef cond_syscall
|
|
#define cond_syscall(x) asm(".weak\t" __SYMBOL_NAME(x) \
|
|
"\n\t.set\t" __SYMBOL_NAME(x) "," __SYMBOL_NAME(sys_ni_syscall));
|
|
#endif
|
|
|
|
#ifndef SYSCALL_ALIAS
|
|
#define SYSCALL_ALIAS(alias, name) \
|
|
asm ("\t.globl " __SYMBOL_NAME(alias) \
|
|
"\n\t.set\t" __SYMBOL_NAME(alias) "," __SYMBOL_NAME(name))
|
|
#endif
|
|
|
|
#define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE)
|
|
#define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE)
|
|
|
|
/*
|
|
* For assembly routines.
|
|
*
|
|
* Note when using these that you must specify the appropriate
|
|
* alignment directives yourself
|
|
*/
|
|
#define __PAGE_ALIGNED_DATA .section ".data..page_aligned", "aw"
|
|
#define __PAGE_ALIGNED_BSS .section ".bss..page_aligned", "aw"
|
|
|
|
/*
|
|
* This is used by architectures to keep arguments on the stack
|
|
* untouched by the compiler by keeping them live until the end.
|
|
* The argument stack may be owned by the assembly-language
|
|
* caller, not the callee, and gcc doesn't always understand
|
|
* that.
|
|
*
|
|
* We have the return value, and a maximum of six arguments.
|
|
*
|
|
* This should always be followed by a "return ret" for the
|
|
* protection to work (ie no more work that the compiler might
|
|
* end up needing stack temporaries for).
|
|
*/
|
|
/* Assembly files may be compiled with -traditional .. */
|
|
#ifndef __ASSEMBLY__
|
|
#ifndef asmlinkage_protect
|
|
# define asmlinkage_protect(n, ret, args...) do { } while (0)
|
|
#endif
|
|
#endif
|
|
|
|
#ifndef __ALIGN
|
|
#define __ALIGN .align 4,0x90
|
|
#define __ALIGN_STR ".align 4,0x90"
|
|
#endif
|
|
|
|
#ifdef __ASSEMBLY__
|
|
|
|
#ifndef LINKER_SCRIPT
|
|
#define ALIGN __ALIGN
|
|
#define ALIGN_STR __ALIGN_STR
|
|
|
|
#ifndef ENTRY
|
|
#define ENTRY(name) \
|
|
.globl name; \
|
|
ALIGN; \
|
|
name:
|
|
#endif
|
|
#endif /* LINKER_SCRIPT */
|
|
|
|
#ifndef WEAK
|
|
#define WEAK(name) \
|
|
.weak name; \
|
|
name:
|
|
#endif
|
|
|
|
#ifndef END
|
|
#define END(name) \
|
|
.size name, .-name
|
|
#endif
|
|
|
|
/* If symbol 'name' is treated as a subroutine (gets called, and returns)
|
|
* then please use ENDPROC to mark 'name' as STT_FUNC for the benefit of
|
|
* static analysis tools such as stack depth analyzer.
|
|
*/
|
|
#ifndef ENDPROC
|
|
#define ENDPROC(name) \
|
|
.type name, @function; \
|
|
END(name)
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#endif
|