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

This project is archived. Its data is read-only.

Commit aaf8a7a2 authored Nov 02, 2005 by Stephen Rothwell

Merge iSeries include file move

parents 104dd65f ecb3ca27

arch/powerpc/kernel/asm-offsets.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@
		#ifdef CONFIG_PPC64
		#include <asm/paca.h>
		#include <asm/lppaca.h>
		#include <asm/iSeries/HvLpEvent.h>
		#include <asm/iseries/hv_lp_event.h>
		#include <asm/cache.h>
		#include <asm/systemcfg.h>
		#include <asm/compat.h>

arch/powerpc/kernel/head_64.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@
		#include <asm/cputable.h>
		#include <asm/setup.h>
		#include <asm/hvcall.h>
		#include <asm/iSeries/LparMap.h>
		#include <asm/iseries/lpar_map.h>
		#include <asm/thread_info.h>

		#ifdef CONFIG_PPC_ISERIES

arch/powerpc/kernel/lparmap.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@
		*/
		#include <asm/mmu.h>
		#include <asm/page.h>
		#include <asm/iSeries/LparMap.h>
		#include <asm/iseries/lpar_map.h>

		const struct LparMap __attribute__((__section__(".text"))) xLparMap = {
		.xNumberEsids = HvEsidsToMap,

arch/powerpc/kernel/setup_64.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@
		#include <asm/page.h>
		#include <asm/mmu.h>
		#include <asm/lmb.h>
		#include <asm/iSeries/ItLpNaca.h>
		#include <asm/iseries/it_lp_naca.h>
		#include <asm/firmware.h>
		#include <asm/systemcfg.h>
		#include <asm/xmon.h>

arch/powerpc/kernel/time.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -66,8 +66,8 @@
		#include <asm/firmware.h>
		#endif
		#ifdef CONFIG_PPC_ISERIES
		#include <asm/iSeries/ItLpQueue.h>
		#include <asm/iSeries/HvCallXm.h>
		#include <asm/iseries/it_lp_queue.h>
		#include <asm/iseries/hv_call_xm.h>
		#endif

		/* keep track of when we need to update the rtc */