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

Commit 952ecef7 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge Stephen Rothwell's patches

parents beeca087 252e75a5

arch/powerpc/platforms/Makefile

+7 −4
Original line number Diff line number Diff line 
ifeq ($(CONFIG_PPC32),y)

obj-$(CONFIG_PPC_PMAC)		+= powermac/

endif

obj-$(CONFIG_4xx)		+= 4xx/

obj-$(CONFIG_83xx)		+= 83xx/

obj-$(CONFIG_85xx)		+= 85xx/

obj-$(CONFIG_PPC_ISERIES)	+= iseries/

arch/powerpc/platforms/iseries/Makefile

0 → 100644
+7 −0
Original line number Diff line number Diff line 
obj-y += hvlog.o hvlpconfig.o lpardata.o setup.o mf.o lpevents.o \

	hvcall.o proc.o htab.o iommu.o misc.o

obj-$(CONFIG_PCI) += pci.o irq.o vpdinfo.o

obj-$(CONFIG_IBMVIO) += vio.o

obj-$(CONFIG_SMP) += smp.o

obj-$(CONFIG_VIOPATH) += viopath.o

obj-$(CONFIG_MODULES) += ksyms.o

arch/ppc64/kernel/iSeries_htab.c→arch/powerpc/platforms/iseries/htab.c

+13 −12
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 
#include <asm/abs_addr.h>

#include <linux/spinlock.h>



static spinlock_t iSeries_hlocks[64] __cacheline_aligned_in_smp = { [0 ... 63] = SPIN_LOCK_UNLOCKED};

static spinlock_t iSeries_hlocks[64] __cacheline_aligned_in_smp =

	{ [0 ... 63] = SPIN_LOCK_UNLOCKED};



/*

 * Very primitive algorithm for picking up a lock

arch/ppc64/kernel/hvCall.S→arch/powerpc/platforms/iseries/hvcall.S

+8 −13
Original line number Diff line number Diff line 
/*

 * arch/ppc64/kernel/hvCall.S

 *

 *

 * This file contains the code to perform calls to the

 * iSeries LPAR hypervisor

 *
@@ -94,5 +91,3 @@ _GLOBAL(HvCall7Ret16) 
	ld	r31,-16(r1)



	blr

arch/ppc64/kernel/HvCall.c→arch/powerpc/platforms/iseries/hvlog.c

+0 −1
Original line number Diff line number Diff line 
/*

 * HvCall.c

 * Copyright (C) 2001  Mike Corrigan IBM Corporation

 * 

 * This program is free software; you can redistribute it and/or modify