Commit cb5c7980 authored by Stephen Rothwell's avatar Stephen Rothwell
Browse files

powerpc: move iSeries_proc.c to powerpc/platforms/iseries 



And renamed it to proc.c

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent 544cbbae

arch/powerpc/platforms/iseries/Makefile

+2 −1
Original line number Original line Diff line number Diff line 
obj-y += hvlog.o hvlpconfig.o lpardata.o setup.o mf.o lpevents.o hvcall.o
 
obj-y += hvlog.o hvlpconfig.o lpardata.o setup.o mf.o lpevents.o \

	hvcall.o proc.o

arch/ppc64/kernel/iSeries_proc.c→arch/powerpc/platforms/iseries/proc.c

+6 −4
Original line number Original line Diff line number Diff line 
/*

/*

 * iSeries_proc.c

 * Copyright (C) 2001  Kyle A. Lucke IBM Corporation

 * Copyright (C) 2001  Kyle A. Lucke IBM Corporation

 * Copyright (C) 2001 Mike Corrigan & Dave Engebretsen IBM Corporation

 * Copyright (C) 2001 Mike Corrigan & Dave Engebretsen IBM Corporation

 *

 *
@@ -68,12 +67,15 @@ static int proc_titantod_show(struct seq_file *m, void *v) 
		unsigned long tb_ticks = (tb0 - startTb);

		unsigned long tb_ticks = (tb0 - startTb);

		unsigned long titan_jiffies = titan_usec / (1000000/HZ);

		unsigned long titan_jiffies = titan_usec / (1000000/HZ);

		unsigned long titan_jiff_usec = titan_jiffies * (1000000/HZ);

		unsigned long titan_jiff_usec = titan_jiffies * (1000000/HZ);

		unsigned long titan_jiff_rem_usec = titan_usec - titan_jiff_usec;

		unsigned long titan_jiff_rem_usec =

			titan_usec - titan_jiff_usec;

		unsigned long tb_jiffies = tb_ticks / tb_ticks_per_jiffy;

		unsigned long tb_jiffies = tb_ticks / tb_ticks_per_jiffy;

		unsigned long tb_jiff_ticks = tb_jiffies * tb_ticks_per_jiffy;

		unsigned long tb_jiff_ticks = tb_jiffies * tb_ticks_per_jiffy;

		unsigned long tb_jiff_rem_ticks = tb_ticks - tb_jiff_ticks;

		unsigned long tb_jiff_rem_ticks = tb_ticks - tb_jiff_ticks;

		unsigned long tb_jiff_rem_usec = tb_jiff_rem_ticks / tb_ticks_per_usec;

		unsigned long tb_jiff_rem_usec =

		unsigned long new_tb_ticks_per_jiffy = (tb_ticks * (1000000/HZ))/titan_usec;

			tb_jiff_rem_ticks / tb_ticks_per_usec;

		unsigned long new_tb_ticks_per_jiffy =

			(tb_ticks * (1000000/HZ))/titan_usec;





		seq_printf(m, "  titan elapsed = %lu uSec\n", titan_usec);

		seq_printf(m, "  titan elapsed = %lu uSec\n", titan_usec);

		seq_printf(m, "  tb elapsed    = %lu ticks\n", tb_ticks);

		seq_printf(m, "  tb elapsed    = %lu ticks\n", tb_ticks);

arch/ppc64/kernel/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,7 @@ pci-obj-$(CONFIG_PPC_MULTIPLATFORM) += pci_dn.o pci_direct_iommu.o 




obj-$(CONFIG_PCI)	+= pci.o pci_iommu.o iomap.o $(pci-obj-y)

obj-$(CONFIG_PCI)	+= pci.o pci_iommu.o iomap.o $(pci-obj-y)





obj-$(CONFIG_PPC_ISERIES) += iSeries_proc.o iSeries_htab.o \

obj-$(CONFIG_PPC_ISERIES) += iSeries_htab.o \

			     iSeries_iommu.o

			     iSeries_iommu.o





obj-$(CONFIG_PPC_MULTIPLATFORM) += nvram.o i8259.o prom_init.o

obj-$(CONFIG_PPC_MULTIPLATFORM) += nvram.o i8259.o prom_init.o