adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

lockdep: use stringify.h

Browse source 
Arnd pointed out we have the stringify macro magic already in-kernel.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
CC: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Peter Zijlstra 2009-01-29 14:50:36 +01:00 committed by Ingo Molnar
parent 4f367d8adc
commit b4b136f44b
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
kernel/lockdep.c
View file

@ -41,6 +41,7 @@
#include <linux/utsname.h> #include <linux/utsname.h>
#include <linux/hash.h> #include <linux/hash.h>
#include <linux/ftrace.h> #include <linux/ftrace.h>
#include <linux/stringify.h>
#include <asm/sections.h> #include <asm/sections.h>
@ -445,14 +446,11 @@ atomic_t nr_find_usage_backwards_recursions;
* Locking printouts: * Locking printouts:
*/ */
#define __STR(foo) #foo
#define STR(foo) __STR(foo)
#define __USAGE(__STATE) \ #define __USAGE(__STATE) \
[LOCK_USED_IN_##__STATE] = "IN-"STR(__STATE)"-W", \ [LOCK_USED_IN_##__STATE] = "IN-"__stringify(__STATE)"-W", \
[LOCK_ENABLED_##__STATE] = STR(__STATE)"-ON-W", \ [LOCK_ENABLED_##__STATE] = __stringify(__STATE)"-ON-W", \
[LOCK_USED_IN_##__STATE##_READ] = "IN-"STR(__STATE)"-R", \ [LOCK_USED_IN_##__STATE##_READ] = "IN-"__stringify(__STATE)"-R",\
[LOCK_ENABLED_##__STATE##_READ] = STR(__STATE)"-ON-R", [LOCK_ENABLED_##__STATE##_READ] = __stringify(__STATE)"-ON-R",
static const char *usage_str[] = static const char *usage_str[] =
{ {
@ -1270,14 +1268,14 @@ check_usage(struct task_struct *curr, struct held_lock *prev,
static const char *state_names[] = { static const char *state_names[] = {
#define LOCKDEP_STATE(__STATE) \ #define LOCKDEP_STATE(__STATE) \
STR(__STATE), __stringify(__STATE),
#include "lockdep_states.h" #include "lockdep_states.h"
#undef LOCKDEP_STATE #undef LOCKDEP_STATE
}; };
static const char *state_rnames[] = { static const char *state_rnames[] = {
#define LOCKDEP_STATE(__STATE) \ #define LOCKDEP_STATE(__STATE) \
STR(__STATE)"-READ", __stringify(__STATE)"-READ",
#include "lockdep_states.h" #include "lockdep_states.h"
#undef LOCKDEP_STATE #undef LOCKDEP_STATE
}; };