openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
David Gibson 2005-11-02 15:13:20 +11:00 committed by Paul Mackerras
parent 1fc8b4ef4e
commit 9933f299d0
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef _ASM_DART_H
#define _ASM_DART_H
#ifndef _POWERPC_SYSDEV_DART_H
#define _POWERPC_SYSDEV_DART_H
/* physical base of DART registers */
@ -56,4 +56,4 @@
#define DART_PAGE_FACTOR (PAGE_SHIFT - DART_PAGE_SHIFT)
#endif
#endif /* _POWERPC_SYSDEV_DART_H */

5
arch/powerpc/sysdev/u3_iommu.c
View File

@ -1,5 +1,5 @@
/*
* arch/ppc64/kernel/u3_iommu.c
* arch/powerpc/sysdev/u3_iommu.c
*
* Copyright (C) 2004 Olof Johansson <olof@austin.ibm.com>, IBM Corporation
*
@ -44,9 +44,10 @@
#include <asm/abs_addr.h>
#include <asm/cacheflush.h>
#include <asm/lmb.h>
#include <asm/dart.h>
#include <asm/ppc-pci.h>
#include "dart.h"
extern int iommu_force_on;
/* Physical base address and size of the DART table */