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

Commit 212bebb4 authored by Deepthi Dharwar's avatar Deepthi Dharwar Committed by Benjamin Herrenschmidt
Browse files

pseries: Move plpar_wrapper.h to powerpc common include/asm location. 



As a part of pseries_idle backend driver cleanup to make
the code common to both pseries and powernv platforms, it
is necessary to move the backend-driver code to drivers/cpuidle.

As a pre-requisite for that, it is essential to move plpar_wrapper.h
to include/asm.

Signed-off-by: default avatarDeepthi Dharwar <deepthi@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 9b3fbd6c

arch/powerpc/platforms/pseries/plpar_wrappers.h→arch/powerpc/include/asm/plpar_wrappers.h

+3 −3
Original line number Original line Diff line number Diff line 
#ifndef _PSERIES_PLPAR_WRAPPERS_H

#ifndef _ASM_POWERPC_PLPAR_WRAPPERS_H

#define _PSERIES_PLPAR_WRAPPERS_H

#define _ASM_POWERPC_PLPAR_WRAPPERS_H





#include <linux/string.h>

#include <linux/string.h>

#include <linux/irqflags.h>

#include <linux/irqflags.h>
@@ -297,4 +297,4 @@ static inline long plapr_set_watchpoint0(unsigned long dawr0, unsigned long dawr 
	return plpar_set_mode(0, 2, dawr0, dawrx0);

	return plpar_set_mode(0, 2, dawr0, dawrx0);

}

}





#endif /* _PSERIES_PLPAR_WRAPPERS_H */
 
#endif /* _ASM_POWERPC_PLPAR_WRAPPERS_H */

arch/powerpc/platforms/pseries/cmm.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -40,8 +40,7 @@ 
#include <asm/pgalloc.h>

#include <asm/pgalloc.h>

#include <asm/uaccess.h>

#include <asm/uaccess.h>

#include <linux/memory.h>

#include <linux/memory.h>



#include <asm/plpar_wrappers.h>

#include "plpar_wrappers.h"





#define CMM_DRIVER_VERSION	"1.0.0"

#define CMM_DRIVER_VERSION	"1.0.0"

#define CMM_DEFAULT_DELAY	1

#define CMM_DEFAULT_DELAY	1

arch/powerpc/platforms/pseries/dtl.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -29,8 +29,7 @@ 
#include <asm/firmware.h>

#include <asm/firmware.h>

#include <asm/lppaca.h>

#include <asm/lppaca.h>

#include <asm/debug.h>

#include <asm/debug.h>



#include <asm/plpar_wrappers.h>

#include "plpar_wrappers.h"





struct dtl {

struct dtl {

	struct dtl_entry	*buf;

	struct dtl_entry	*buf;

arch/powerpc/platforms/pseries/hotplug-cpu.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,8 @@ 
#include <asm/machdep.h>

#include <asm/machdep.h>

#include <asm/vdso_datapage.h>

#include <asm/vdso_datapage.h>

#include <asm/xics.h>

#include <asm/xics.h>

#include "plpar_wrappers.h"

#include <asm/plpar_wrappers.h>



#include "offline_states.h"

#include "offline_states.h"





/* This version can't take the spinlock, because it never returns */

/* This version can't take the spinlock, because it never returns */

arch/powerpc/platforms/pseries/hvconsole.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <linux/errno.h>

#include <linux/errno.h>

#include <asm/hvcall.h>

#include <asm/hvcall.h>

#include <asm/hvconsole.h>

#include <asm/hvconsole.h>

#include "plpar_wrappers.h"

#include <asm/plpar_wrappers.h>





/**

/**

 * hvc_get_chars - retrieve characters from firmware for denoted vterm adatper

 * hvc_get_chars - retrieve characters from firmware for denoted vterm adatper