openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2009-05-02 16:28:58 -07:00
parent 65fd21058a 9cd67243de
commit 912e7796b0
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/m32r/boot/compressed/Makefile
View File

@ -6,7 +6,6 @@
targets := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o \ targets := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o \
piggy.o vmlinux.lds piggy.o vmlinux.lds
EXTRA_AFLAGS := -traditional
OBJECTS = $(obj)/head.o $(obj)/misc.o OBJECTS = $(obj)/head.o $(obj)/misc.o

7
arch/m32r/include/asm/assembler.h
View File

@ -9,14 +9,15 @@
* This file contains M32R architecture specific macro definitions. * This file contains M32R architecture specific macro definitions.
*/ */
#include <linux/stringify.h>
#undef __STR
#ifndef __STR
#ifdef __ASSEMBLY__ #ifdef __ASSEMBLY__
#define __STR(x) x #define __STR(x) x
#else #else
#define __STR(x) #x #define __STR(x) __stringify(x)
#endif #endif
#endif /* __STR */
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
#define M32R_LOCK __STR(lock) #define M32R_LOCK __STR(lock)

2
arch/m32r/kernel/Makefile
View File

@ -9,5 +9,3 @@ obj-y := process.o entry.o traps.o align.o irq.o setup.o time.o \
obj-$(CONFIG_SMP) += smp.o smpboot.o obj-$(CONFIG_SMP) += smp.o smpboot.o
obj-$(CONFIG_MODULES) += module.o obj-$(CONFIG_MODULES) += module.o
EXTRA_AFLAGS := -traditional