From 54cbec2f343853bdef5bed220222a49e4647740b Mon Sep 17 00:00:00 2001 From: James Hogan Date: Wed, 1 May 2013 22:04:17 +0100 Subject: [PATCH] --- yaml --- r: 369917 b: refs/heads/master c: 126de6b20bfb82cc19012d5048f11f339ae5a021 h: refs/heads/master i: 369915: 323240b70c2074902229653c1fd3bb16a2a478c5 v: v3 --- [refs] | 2 +- trunk/include/linux/linkage.h | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index b21527204620..2e7e3709389f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 73287a43cc79ca06629a88d1a199cd283f42456a +refs/heads/master: 126de6b20bfb82cc19012d5048f11f339ae5a021 diff --git a/trunk/include/linux/linkage.h b/trunk/include/linux/linkage.h index 829d66c67fc2..de09dec25ec3 100644 --- a/trunk/include/linux/linkage.h +++ b/trunk/include/linux/linkage.h @@ -15,14 +15,11 @@ #define asmlinkage CPP_ASMLINKAGE #endif -#ifndef SYMBOL_NAME #ifdef CONFIG_SYMBOL_PREFIX -#define SYMBOL_NAME(x) CONFIG_SYMBOL_PREFIX ## x +#define __SYMBOL_NAME(x) CONFIG_SYMBOL_PREFIX __stringify(x) #else -#define SYMBOL_NAME(x) x +#define __SYMBOL_NAME(x) __stringify(x) #endif -#endif -#define __SYMBOL_NAME(x) __stringify(SYMBOL_NAME(x)) #ifndef cond_syscall #define cond_syscall(x) asm(".weak\t" __SYMBOL_NAME(x) \