Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 912e7796 authored May 02, 2009 by Linus Torvalds

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

parents 65fd2105 9cd67243

arch/m32r/boot/compressed/Makefile

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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

arch/m32r/include/asm/assembler.h

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -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)

arch/m32r/kernel/Makefile

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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