[PATCH] powerpc: clean up iommu.h a bit
There was a function declared for CONFIG_PSERIES which no longer exists and the two function declarations for CONFIG_ISERIES have been moved into an include file in platforms/iseries since they are defined and used only there. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
ee2cdecec4
commit
9bd7ea60b1
|
@ -34,6 +34,8 @@
|
|||
#include <asm/pci-bridge.h>
|
||||
#include <asm/iseries/hv_call_xm.h>
|
||||
|
||||
#include "iommu.h"
|
||||
|
||||
extern struct list_head iSeries_Global_Device_List;
|
||||
|
||||
|
||||
|
|
35
arch/powerpc/platforms/iseries/iommu.h
Normal file
35
arch/powerpc/platforms/iseries/iommu.h
Normal file
|
@ -0,0 +1,35 @@
|
|||
#ifndef _PLATFORMS_ISERIES_IOMMU_H
|
||||
#define _PLATFORMS_ISERIES_IOMMU_H
|
||||
|
||||
/*
|
||||
* Copyright (C) 2005 Stephen Rothwell, IBM Corporation
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the:
|
||||
* Free Software Foundation, Inc.,
|
||||
* 59 Temple Place, Suite 330,
|
||||
* Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
struct device_node;
|
||||
struct iommu_table;
|
||||
|
||||
/* Creates table for an individual device node */
|
||||
extern void iommu_devnode_init_iSeries(struct device_node *dn);
|
||||
|
||||
/* Get table parameters from HV */
|
||||
extern void iommu_table_getparms_iSeries(unsigned long busno,
|
||||
unsigned char slotno, unsigned char virtbus,
|
||||
struct iommu_table *tbl);
|
||||
|
||||
#endif /* _PLATFORMS_ISERIES_IOMMU_H */
|
|
@ -43,6 +43,7 @@
|
|||
#include "irq.h"
|
||||
#include "pci.h"
|
||||
#include "call_pci.h"
|
||||
#include "iommu.h"
|
||||
|
||||
extern unsigned long io_page_mask;
|
||||
|
||||
|
|
|
@ -22,6 +22,8 @@
|
|||
#include <asm/iseries/hv_lp_config.h>
|
||||
#include <asm/iseries/hv_call_xm.h>
|
||||
|
||||
#include "iommu.h"
|
||||
|
||||
struct device *iSeries_vio_dev = &vio_bus_device.dev;
|
||||
EXPORT_SYMBOL(iSeries_vio_dev);
|
||||
|
||||
|
|
|
@ -64,25 +64,6 @@ extern void iommu_free_table(struct device_node *dn);
|
|||
|
||||
#endif /* CONFIG_PPC_MULTIPLATFORM */
|
||||
|
||||
#ifdef CONFIG_PPC_PSERIES
|
||||
|
||||
/* Creates table for an individual device node */
|
||||
extern void iommu_devnode_init_pSeries(struct device_node *dn);
|
||||
|
||||
#endif /* CONFIG_PPC_PSERIES */
|
||||
|
||||
#ifdef CONFIG_PPC_ISERIES
|
||||
|
||||
/* Creates table for an individual device node */
|
||||
extern void iommu_devnode_init_iSeries(struct device_node *dn);
|
||||
/* Get table parameters from HV */
|
||||
extern void iommu_table_getparms_iSeries(unsigned long busno,
|
||||
unsigned char slotno,
|
||||
unsigned char virtbus,
|
||||
struct iommu_table* tbl);
|
||||
|
||||
#endif /* CONFIG_PPC_ISERIES */
|
||||
|
||||
/* Initializes an iommu_table based in values set in the passed-in
|
||||
* structure
|
||||
*/
|
||||
|
|
Loading…
Reference in a new issue