Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

merge filename and modify references to iseries/hv_call.h

Signed-off-by: Kelly Daly <kelly@au.ibm.com>

+6 -6
+1 -1
arch/powerpc/lib/locks.c
··· 22 22 /* waiting for a spinlock... */ 23 23 #if defined(CONFIG_PPC_SPLPAR) || defined(CONFIG_PPC_ISERIES) 24 24 #include <asm/hvcall.h> 25 - #include <asm/iSeries/HvCall.h> 25 + #include <asm/iseries/hv_call.h> 26 26 27 27 void __spin_yield(raw_spinlock_t *lock) 28 28 {
+1 -1
arch/powerpc/platforms/iseries/hvlog.c
··· 9 9 10 10 #include <asm/page.h> 11 11 #include <asm/abs_addr.h> 12 - #include <asm/iSeries/HvCall.h> 12 + #include <asm/iseries/hv_call.h> 13 13 #include <asm/iSeries/HvCallSc.h> 14 14 #include <asm/iSeries/HvTypes.h> 15 15
+1 -1
arch/powerpc/platforms/iseries/smp.c
··· 38 38 #include <asm/io.h> 39 39 #include <asm/smp.h> 40 40 #include <asm/paca.h> 41 - #include <asm/iSeries/HvCall.h> 41 + #include <asm/iseries/hv_call.h> 42 42 #include <asm/time.h> 43 43 #include <asm/ppcdebug.h> 44 44 #include <asm/machdep.h>
+1 -1
drivers/char/viocons.c
··· 49 49 #include <asm/iSeries/HvLpEvent.h> 50 50 #include <asm/iSeries/HvCallEvent.h> 51 51 #include <asm/iSeries/HvLpConfig.h> 52 - #include <asm/iSeries/HvCall.h> 52 + #include <asm/iseries/hv_call.h> 53 53 54 54 #ifdef CONFIG_VT 55 55 #error You must turn off CONFIG_VT to use CONFIG_VIOCONS
+1 -1
include/asm-powerpc/time.h
··· 21 21 #include <asm/processor.h> 22 22 #ifdef CONFIG_PPC64 23 23 #include <asm/paca.h> 24 - #include <asm/iSeries/HvCall.h> 24 + #include <asm/iseries/hv_call.h> 25 25 #endif 26 26 27 27 /* time.c */
include/asm-ppc64/iSeries/HvCall.h include/asm-powerpc/iseries/hv_call.h
+1 -1
include/asm-ppc64/spinlock.h
··· 21 21 #include <linux/config.h> 22 22 #include <asm/paca.h> 23 23 #include <asm/hvcall.h> 24 - #include <asm/iSeries/HvCall.h> 24 + #include <asm/iseries/hv_call.h> 25 25 26 26 #define __raw_spin_is_locked(x) ((x)->slock != 0) 27 27