mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 13:22:23 +00:00
merge filename and modify references to iseries/hv_call.h
Signed-off-by: Kelly Daly <kelly@au.ibm.com>
This commit is contained in:
parent
e2f2e58e79
commit
1da4403788
@ -22,7 +22,7 @@
|
||||
/* waiting for a spinlock... */
|
||||
#if defined(CONFIG_PPC_SPLPAR) || defined(CONFIG_PPC_ISERIES)
|
||||
#include <asm/hvcall.h>
|
||||
#include <asm/iSeries/HvCall.h>
|
||||
#include <asm/iseries/hv_call.h>
|
||||
|
||||
void __spin_yield(raw_spinlock_t *lock)
|
||||
{
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
#include <asm/page.h>
|
||||
#include <asm/abs_addr.h>
|
||||
#include <asm/iSeries/HvCall.h>
|
||||
#include <asm/iseries/hv_call.h>
|
||||
#include <asm/iSeries/HvCallSc.h>
|
||||
#include <asm/iSeries/HvTypes.h>
|
||||
|
||||
|
@ -38,7 +38,7 @@
|
||||
#include <asm/io.h>
|
||||
#include <asm/smp.h>
|
||||
#include <asm/paca.h>
|
||||
#include <asm/iSeries/HvCall.h>
|
||||
#include <asm/iseries/hv_call.h>
|
||||
#include <asm/time.h>
|
||||
#include <asm/ppcdebug.h>
|
||||
#include <asm/machdep.h>
|
||||
|
@ -49,7 +49,7 @@
|
||||
#include <asm/iSeries/HvLpEvent.h>
|
||||
#include <asm/iSeries/HvCallEvent.h>
|
||||
#include <asm/iSeries/HvLpConfig.h>
|
||||
#include <asm/iSeries/HvCall.h>
|
||||
#include <asm/iseries/hv_call.h>
|
||||
|
||||
#ifdef CONFIG_VT
|
||||
#error You must turn off CONFIG_VT to use CONFIG_VIOCONS
|
||||
|
@ -21,7 +21,7 @@
|
||||
#include <asm/processor.h>
|
||||
#ifdef CONFIG_PPC64
|
||||
#include <asm/paca.h>
|
||||
#include <asm/iSeries/HvCall.h>
|
||||
#include <asm/iseries/hv_call.h>
|
||||
#endif
|
||||
|
||||
/* time.c */
|
||||
|
@ -21,7 +21,7 @@
|
||||
#include <linux/config.h>
|
||||
#include <asm/paca.h>
|
||||
#include <asm/hvcall.h>
|
||||
#include <asm/iSeries/HvCall.h>
|
||||
#include <asm/iseries/hv_call.h>
|
||||
|
||||
#define __raw_spin_is_locked(x) ((x)->slock != 0)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user