diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-02 19:28:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-02 19:28:58 -0400 |
| commit | 912e7796b06fa9b1006835605e27c42e46801b8f (patch) | |
| tree | 2c35b2ce8ea83f936ac6ff811e50e726ce1f9308 /arch | |
| parent | 65fd21058a791f35aff11eeccd2e270f0faf11ec (diff) | |
| parent | 9cd67243de582c206758adff152c5fcc1b2aa069 (diff) | |
Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
* 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev:
m32r: use __stringify() macro in assembler.h
m32r: build fix for __stringify macro
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m32r/boot/compressed/Makefile | 1 | ||||
| -rw-r--r-- | arch/m32r/include/asm/assembler.h | 7 | ||||
| -rw-r--r-- | arch/m32r/kernel/Makefile | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/arch/m32r/boot/compressed/Makefile b/arch/m32r/boot/compressed/Makefile index d908e1d3c07f..560484ae35ec 100644 --- a/arch/m32r/boot/compressed/Makefile +++ b/arch/m32r/boot/compressed/Makefile | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | 6 | ||
| 7 | targets := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o \ | 7 | targets := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o \ |
| 8 | piggy.o vmlinux.lds | 8 | piggy.o vmlinux.lds |
| 9 | EXTRA_AFLAGS := -traditional | ||
| 10 | 9 | ||
| 11 | OBJECTS = $(obj)/head.o $(obj)/misc.o | 10 | OBJECTS = $(obj)/head.o $(obj)/misc.o |
| 12 | 11 | ||
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) |
diff --git a/arch/m32r/kernel/Makefile b/arch/m32r/kernel/Makefile index 09200d4886e3..b1a4b6036591 100644 --- a/arch/m32r/kernel/Makefile +++ b/arch/m32r/kernel/Makefile | |||
| @@ -9,5 +9,3 @@ obj-y := process.o entry.o traps.o align.o irq.o setup.o time.o \ | |||
| 9 | 9 | ||
| 10 | obj-$(CONFIG_SMP) += smp.o smpboot.o | 10 | obj-$(CONFIG_SMP) += smp.o smpboot.o |
| 11 | obj-$(CONFIG_MODULES) += module.o | 11 | obj-$(CONFIG_MODULES) += module.o |
| 12 | |||
| 13 | EXTRA_AFLAGS := -traditional | ||