diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2012-11-22 12:30:25 +1030 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2012-12-14 13:06:40 +1030 |
| commit | 34182eea36fc1d70d748b0947c873314980ba806 (patch) | |
| tree | 373fa6d990175a89a43e538983da15b3c8107171 | |
| parent | 6f33d58794ef4cef4b2c706029810f9688bd3026 (diff) | |
| download | op-kernel-dev-34182eea36fc1d70d748b0947c873314980ba806.zip op-kernel-dev-34182eea36fc1d70d748b0947c873314980ba806.tar.gz | |
moduleparam: use __UNIQUE_ID()
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
| -rw-r--r-- | include/linux/moduleparam.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h index d6a5806..137b419 100644 --- a/include/linux/moduleparam.h +++ b/include/linux/moduleparam.h @@ -16,17 +16,15 @@ /* Chosen so that structs with an unsigned long line up. */ #define MAX_PARAM_PREFIX_LEN (64 - sizeof(unsigned long)) -#define ___module_cat(a,b) __mod_ ## a ## b -#define __module_cat(a,b) ___module_cat(a,b) #ifdef MODULE #define __MODULE_INFO(tag, name, info) \ -static const char __module_cat(name,__LINE__)[] \ +static const char __UNIQUE_ID(name)[] \ __used __attribute__((section(".modinfo"), unused, aligned(1))) \ = __stringify(tag) "=" info #else /* !MODULE */ /* This struct is here for syntactic coherency, it is not used */ #define __MODULE_INFO(tag, name, info) \ - struct __module_cat(name,__LINE__) {} + struct __UNIQUE_ID(name) {} #endif #define __MODULE_PARM_TYPE(name, _type) \ __MODULE_INFO(parmtype, name##type, #name ":" _type) |
