powerpc: move set_msr() and get_msr() into .h

set_msr() and get_msr() are defined and used twice.
This patch moves them into ppc.h

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
master
Christophe Leroy 7 years ago committed by Tom Rini
parent f0eda3cb89
commit f1cd73674f
  1. 14
      arch/powerpc/include/asm/ppc.h
  2. 14
      arch/powerpc/lib/interrupts.c
  3. 14
      arch/powerpc/lib/kgdb.c

@ -96,6 +96,20 @@ static inline ulong get_ddr_freq(ulong dummy)
ulong get_ddr_freq(ulong);
#endif
static inline unsigned long get_msr(void)
{
unsigned long msr;
asm volatile ("mfmsr %0" : "=r" (msr) : );
return msr;
}
static inline void set_msr(unsigned long msr)
{
asm volatile ("mtmsr %0" : : "r" (msr));
}
#endif /* !__ASSEMBLY__ */
#ifdef CONFIG_PPC

@ -33,20 +33,6 @@ extern void timer_interrupt_cpu (struct pt_regs *);
static unsigned decrementer_count; /* count value for 1e6/HZ microseconds */
static __inline__ unsigned long get_msr (void)
{
unsigned long msr;
asm volatile ("mfmsr %0":"=r" (msr):);
return msr;
}
static __inline__ void set_msr (unsigned long msr)
{
asm volatile ("mtmsr %0"::"r" (msr));
}
static __inline__ unsigned long get_dec (void)
{
unsigned long val;

@ -38,20 +38,6 @@ kgdb_longjmp(long *buf, int val)
: "=&r"(temp) : "r" (buf), "r" (val));
}
static inline unsigned long
get_msr(void)
{
unsigned long msr;
asm volatile("mfmsr %0" : "=r" (msr):);
return msr;
}
static inline void
set_msr(unsigned long msr)
{
asm volatile("mtmsr %0" : : "r" (msr));
}
/* Convert the SPARC hardware trap type code to a unix signal number. */
/*
* This table contains the mapping between PowerPC hardware trap types, and

Loading…
Cancel
Save