diff options
Diffstat (limited to 'arch/powerpc/include')
-rw-r--r-- | arch/powerpc/include/asm/iseries/iommu.h | 4 | ||||
-rw-r--r-- | arch/powerpc/include/asm/system.h | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/arch/powerpc/include/asm/iseries/iommu.h b/arch/powerpc/include/asm/iseries/iommu.h index c59ee7e4bed1..1b9692c60899 100644 --- a/arch/powerpc/include/asm/iseries/iommu.h +++ b/arch/powerpc/include/asm/iseries/iommu.h | |||
@@ -26,10 +26,6 @@ struct vio_dev; | |||
26 | struct device_node; | 26 | struct device_node; |
27 | struct iommu_table; | 27 | struct iommu_table; |
28 | 28 | ||
29 | /* Creates table for an individual device node */ | ||
30 | extern void iommu_devnode_init_iSeries(struct pci_dev *pdev, | ||
31 | struct device_node *dn); | ||
32 | |||
33 | /* Get table parameters from HV */ | 29 | /* Get table parameters from HV */ |
34 | extern void iommu_table_getparms_iSeries(unsigned long busno, | 30 | extern void iommu_table_getparms_iSeries(unsigned long busno, |
35 | unsigned char slotno, unsigned char virtbus, | 31 | unsigned char slotno, unsigned char virtbus, |
diff --git a/arch/powerpc/include/asm/system.h b/arch/powerpc/include/asm/system.h index f612798e1c93..2b2420a49884 100644 --- a/arch/powerpc/include/asm/system.h +++ b/arch/powerpc/include/asm/system.h | |||
@@ -212,7 +212,7 @@ extern struct task_struct *_switch(struct thread_struct *prev, | |||
212 | extern unsigned int rtas_data; | 212 | extern unsigned int rtas_data; |
213 | extern int mem_init_done; /* set on boot once kmalloc can be called */ | 213 | extern int mem_init_done; /* set on boot once kmalloc can be called */ |
214 | extern int init_bootmem_done; /* set on !NUMA once bootmem is available */ | 214 | extern int init_bootmem_done; /* set on !NUMA once bootmem is available */ |
215 | extern unsigned long memory_limit; | 215 | extern phys_addr_t memory_limit; |
216 | extern unsigned long klimit; | 216 | extern unsigned long klimit; |
217 | 217 | ||
218 | extern void *alloc_maybe_bootmem(size_t size, gfp_t mask); | 218 | extern void *alloc_maybe_bootmem(size_t size, gfp_t mask); |