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

Commit 415ad1e5 authored by Greg Ungerer's avatar Greg Ungerer Committed by Russell King
Browse files

[ARM] 5053/1: define before use of processor_id 



For the simple read_cpuid() macro case the variable processor_id has
no definition on use of the macro. Add an extern for it. Move all the
processor ID macros into the #ifndef __ASSEMBLEY__ block.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 66aaeff1

include/asm-arm/system.h

+15 −14
Original line number Diff line number Diff line
@@ -48,20 +48,6 @@ 
#define CPUID_TCM	2

#define CPUID_TLBTYPE	3



#ifdef CONFIG_CPU_CP15

#define read_cpuid(reg)							\

	({								\

		unsigned int __val;					\

		asm("mrc	p15, 0, %0, c0, c0, " __stringify(reg)	\

		    : "=r" (__val)					\

		    :							\

		    : "cc");						\

		__val;							\

	})

#else

#define read_cpuid(reg) (processor_id)

#endif



/*

 * This is used to ensure the compiler did actually allocate the register we

 * asked it for some inline assembly sequences.  Apparently we can't trust
@@ -78,6 +64,21 @@ 
#include <linux/stringify.h>

#include <linux/irqflags.h>



#ifdef CONFIG_CPU_CP15

#define read_cpuid(reg)							\

	({								\

		unsigned int __val;					\

		asm("mrc	p15, 0, %0, c0, c0, " __stringify(reg)	\

		    : "=r" (__val)					\

		    :							\

		    : "cc");						\

		__val;							\

	})

#else

extern unsigned int processor_id;

#define read_cpuid(reg) (processor_id)

#endif



/*

 * The CPU ID never changes at run time, so we might as well tell the

 * compiler that it's constant.  Use this function to read the CPU ID