powerpc: Inline ppc64_runlatch_off
I'm sick of seeing ppc64_runlatch_off in our profiles, so inline it into the callers. To avoid a mess of circular includes I didn't add it as an inline function. Signed-off-by: Anton Blanchard <anton@samba.org> Acked-by: Olof Johansson <olof@lixom.net> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
parent
954e6da54b
commit
4138d65333
|
@ -951,7 +951,14 @@
|
||||||
#ifdef CONFIG_PPC64
|
#ifdef CONFIG_PPC64
|
||||||
|
|
||||||
extern void ppc64_runlatch_on(void);
|
extern void ppc64_runlatch_on(void);
|
||||||
extern void ppc64_runlatch_off(void);
|
extern void __ppc64_runlatch_off(void);
|
||||||
|
|
||||||
|
#define ppc64_runlatch_off() \
|
||||||
|
do { \
|
||||||
|
if (cpu_has_feature(CPU_FTR_CTRL) && \
|
||||||
|
test_thread_flag(TIF_RUNLATCH)) \
|
||||||
|
__ppc64_runlatch_off(); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
extern unsigned long scom970_read(unsigned int address);
|
extern unsigned long scom970_read(unsigned int address);
|
||||||
extern void scom970_write(unsigned int address, unsigned long value);
|
extern void scom970_write(unsigned int address, unsigned long value);
|
||||||
|
|
|
@ -1199,19 +1199,17 @@ void ppc64_runlatch_on(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ppc64_runlatch_off(void)
|
void __ppc64_runlatch_off(void)
|
||||||
{
|
{
|
||||||
unsigned long ctrl;
|
unsigned long ctrl;
|
||||||
|
|
||||||
if (cpu_has_feature(CPU_FTR_CTRL) && test_thread_flag(TIF_RUNLATCH)) {
|
HMT_medium();
|
||||||
HMT_medium();
|
|
||||||
|
|
||||||
clear_thread_flag(TIF_RUNLATCH);
|
clear_thread_flag(TIF_RUNLATCH);
|
||||||
|
|
||||||
ctrl = mfspr(SPRN_CTRLF);
|
ctrl = mfspr(SPRN_CTRLF);
|
||||||
ctrl &= ~CTRL_RUNLATCH;
|
ctrl &= ~CTRL_RUNLATCH;
|
||||||
mtspr(SPRN_CTRLT, ctrl);
|
mtspr(SPRN_CTRLT, ctrl);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue