diff options
author | Jens Axboe <jens.axboe@oracle.com> | 2009-05-22 14:25:34 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2009-05-22 14:25:34 -0400 |
commit | e4b636366c00738b9609cda307014d71b1225b7f (patch) | |
tree | 760b67b3624eda62e943e48ce93635c30a5b47bf /arch/m32r/include/asm/assembler.h | |
parent | b9ed7252d219c1c663944bf03846eabb515dbe75 (diff) | |
parent | 279e677faa775ad16e75c32e1bf4a37f8158bc61 (diff) |
Merge branch 'master' into for-2.6.31
Conflicts:
drivers/block/hd.c
drivers/block/mg_disk.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'arch/m32r/include/asm/assembler.h')
-rw-r--r-- | arch/m32r/include/asm/assembler.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/m32r/include/asm/assembler.h b/arch/m32r/include/asm/assembler.h index 26351539b5ff..728799fc70aa 100644 --- a/arch/m32r/include/asm/assembler.h +++ b/arch/m32r/include/asm/assembler.h | |||
@@ -9,14 +9,15 @@ | |||
9 | * This file contains M32R architecture specific macro definitions. | 9 | * This file contains M32R architecture specific macro definitions. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <linux/stringify.h> | ||
13 | |||
14 | #undef __STR | ||
12 | 15 | ||
13 | #ifndef __STR | ||
14 | #ifdef __ASSEMBLY__ | 16 | #ifdef __ASSEMBLY__ |
15 | #define __STR(x) x | 17 | #define __STR(x) x |
16 | #else | 18 | #else |
17 | #define __STR(x) #x | 19 | #define __STR(x) __stringify(x) |
18 | #endif | 20 | #endif |
19 | #endif /* __STR */ | ||
20 | 21 | ||
21 | #ifdef CONFIG_SMP | 22 | #ifdef CONFIG_SMP |
22 | #define M32R_LOCK __STR(lock) | 23 | #define M32R_LOCK __STR(lock) |