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

Commit 06a36db1 authored by Michael Ellerman's avatar Michael Ellerman Committed by Stephen Rothwell
Browse files

[POWERPC] iseries: Move ItLpNaca into platforms/iseries 



Move ItLpNaca into platforms/iseries now that it's not used elsewhere.

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent a2ced11b

arch/powerpc/kernel/setup_64.c

+0 −1
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ 
#include <asm/page.h>

#include <asm/mmu.h>

#include <asm/lmb.h>

#include <asm/iseries/it_lp_naca.h>

#include <asm/firmware.h>

#include <asm/xmon.h>

#include <asm/udbg.h>

arch/powerpc/platforms/iseries/hvlpconfig.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


#include <linux/module.h>

#include <asm/iseries/hv_lp_config.h>

#include <asm/iseries/it_lp_naca.h>

#include "it_lp_naca.h"



HvLpIndex HvLpConfig_getLpIndex_outline(void)

{

include/asm-powerpc/iseries/it_lp_naca.h→arch/powerpc/platforms/iseries/it_lp_naca.h

+3 −3
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA

 */

#ifndef _ASM_POWERPC_ISERIES_IT_LP_NACA_H

#define _ASM_POWERPC_ISERIES_IT_LP_NACA_H

#ifndef _PLATFORMS_ISERIES_IT_LP_NACA_H

#define _PLATFORMS_ISERIES_IT_LP_NACA_H



#include <linux/types.h>
@@ -77,4 +77,4 @@ extern struct ItLpNaca itLpNaca; 
#define ITLPNACA_HWSYNCEDTBS	0x20	/* Hardware synced TBs */

#define ITLPNACA_HMTINT		0x10	/* Utilize MHT for interrupts */



#endif /* _ASM_POWERPC_ISERIES_IT_LP_NACA_H */
 
#endif /* _PLATFORMS_ISERIES_IT_LP_NACA_H */

arch/powerpc/platforms/iseries/lpardata.c

+1 −2
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <asm/processor.h>

#include <asm/ptrace.h>

#include <asm/abs_addr.h>

#include <asm/iseries/it_lp_naca.h>

#include <asm/lppaca.h>

#include <asm/iseries/it_lp_reg_save.h>

#include <asm/paca.h>
@@ -27,6 +26,7 @@ 
#include "processor_vpd.h"

#include "release_data.h"

#include "it_exp_vpd_panel.h"

#include "it_lp_naca.h"



/* The HvReleaseData is the root of the information shared between

 * the hypervisor and Linux.
@@ -127,7 +127,6 @@ struct ItLpNaca itLpNaca = { 
		(u64)instruction_access_slb_iSeries /* 0x480 I-SLB */

	}

};

EXPORT_SYMBOL(itLpNaca);



/* May be filled in by the hypervisor so cannot end up in the BSS */

struct ItIplParmsReal xItIplParmsReal __attribute__((__section__(".data")));

arch/powerpc/platforms/iseries/lpevents.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <asm/iseries/it_lp_queue.h>

#include <asm/iseries/hv_lp_event.h>

#include <asm/iseries/hv_call_event.h>

#include <asm/iseries/it_lp_naca.h>

#include "it_lp_naca.h"



/*

 * The LpQueue is used to pass event data from the hypervisor to