Commit c978b017 authored by Hirokazu Takata's avatar Hirokazu Takata Committed by Linus Torvalds
Browse files

[PATCH] m32r: fix #if warnings 



Fix warnings for #if directives.

Signed-off-by: default avatarHirokazu Takata <takata@linux-m32r.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent baa0b84f

arch/m32r/kernel/setup.c

+12 −12
Original line number Diff line number Diff line
@@ -305,19 +305,19 @@ static int show_cpuinfo(struct seq_file *m, void *v) 


	seq_printf(m, "processor\t: %ld\n", cpu);



#ifdef CONFIG_CHIP_VDEC2

#if defined(CONFIG_CHIP_VDEC2)

	seq_printf(m, "cpu family\t: VDEC2\n"

		"cache size\t: Unknown\n");

#elif  CONFIG_CHIP_M32700

#elif defined(CONFIG_CHIP_M32700)

	seq_printf(m,"cpu family\t: M32700\n"

		"cache size\t: I-8KB/D-8KB\n");

#elif  CONFIG_CHIP_M32102

#elif defined(CONFIG_CHIP_M32102)

	seq_printf(m,"cpu family\t: M32102\n"

		"cache size\t: I-8KB\n");

#elif  CONFIG_CHIP_OPSP

#elif defined(CONFIG_CHIP_OPSP)

	seq_printf(m,"cpu family\t: OPSP\n"

		"cache size\t: I-8KB/D-8KB\n");

#elif  CONFIG_CHIP_MP

#elif defined(CONFIG_CHIP_MP)

	seq_printf(m, "cpu family\t: M32R-MP\n"

		"cache size\t: I-xxKB/D-xxKB\n");

#else
@@ -326,19 +326,19 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
	seq_printf(m, "bogomips\t: %lu.%02lu\n",

		c->loops_per_jiffy/(500000/HZ),

		(c->loops_per_jiffy/(5000/HZ)) % 100);

#ifdef CONFIG_PLAT_MAPPI

#if defined(CONFIG_PLAT_MAPPI)

	seq_printf(m, "Machine\t\t: Mappi Evaluation board\n");

#elif CONFIG_PLAT_MAPPI2

#elif defined(CONFIG_PLAT_MAPPI2)

	seq_printf(m, "Machine\t\t: Mappi-II Evaluation board\n");

#elif CONFIG_PLAT_MAPPI3

#elif defined(CONFIG_PLAT_MAPPI3)

	seq_printf(m, "Machine\t\t: Mappi-III Evaluation board\n");

#elif  CONFIG_PLAT_M32700UT

#elif defined(CONFIG_PLAT_M32700UT)

	seq_printf(m, "Machine\t\t: M32700UT Evaluation board\n");

#elif  CONFIG_PLAT_OPSPUT

#elif defined(CONFIG_PLAT_OPSPUT)

	seq_printf(m, "Machine\t\t: OPSPUT Evaluation board\n");

#elif  CONFIG_PLAT_USRV

#elif defined(CONFIG_PLAT_USRV)

	seq_printf(m, "Machine\t\t: uServer\n");

#elif  CONFIG_PLAT_OAKS32R

#elif defined(CONFIG_PLAT_OAKS32R)

	seq_printf(m, "Machine\t\t: OAKS32R\n");

#else

	seq_printf(m, "Machine\t\t: Unknown\n");

include/asm-m32r/thread_info.h

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static inline struct thread_info *current_thread_info(void) 
}



/* thread information allocation */

#if CONFIG_DEBUG_STACK_USAGE

#ifdef CONFIG_DEBUG_STACK_USAGE

#define alloc_thread_info(tsk)					\

	({							\

		struct thread_info *ret;			\