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 9933f299 authored Nov 02, 2005 by David Gibson Committed by Paul Mackerras Nov 02, 2005

[PATCH] powerpc: Move dart.h



asm-ppc64/dart.h is included in exactly one place -
arch/powerpc/sysdev/u3_iommu.c.  This patch, therefore, moves it into
arch/powerpc/sysdev.  While we're at it, update the #ifndef/#define
protecting the include, and the filename in the comments of
u3_iommu.c.

Built and booted on pSeries and G5, built for ppc32 powermac.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

parent 1fc8b4ef

include/asm-ppc64/dart.h→arch/powerpc/sysdev/dart.h

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -16,8 +16,8 @@
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA		* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	*/		*/

	#ifndef _ASM_DART_H		#ifndef _POWERPC_SYSDEV_DART_H
	#define _ASM_DART_H		#define _POWERPC_SYSDEV_DART_H


	/* physical base of DART registers */		/* physical base of DART registers */
	@@ -56,4 +56,4 @@
	#define DART_PAGE_FACTOR (PAGE_SHIFT - DART_PAGE_SHIFT)		#define DART_PAGE_FACTOR (PAGE_SHIFT - DART_PAGE_SHIFT)


	#endif		#endif /* _POWERPC_SYSDEV_DART_H */

arch/powerpc/sysdev/u3_iommu.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* arch/ppc64/kernel/u3_iommu.c		* arch/powerpc/sysdev/u3_iommu.c
	*		*
	* Copyright (C) 2004 Olof Johansson <olof@austin.ibm.com>, IBM Corporation		* Copyright (C) 2004 Olof Johansson <olof@austin.ibm.com>, IBM Corporation
	*		*
	@@ -44,9 +44,10 @@
	#include <asm/abs_addr.h>		#include <asm/abs_addr.h>
	#include <asm/cacheflush.h>		#include <asm/cacheflush.h>
	#include <asm/lmb.h>		#include <asm/lmb.h>
	#include <asm/dart.h>
	#include <asm/ppc-pci.h>		#include <asm/ppc-pci.h>

			#include "dart.h"

	extern int iommu_force_on;		extern int iommu_force_on;

	/* Physical base address and size of the DART table */		/* Physical base address and size of the DART table */