projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from Linus' tree
[powerpc.git]
/
arch
/
ppc64
/
kernel
/
bpa_iommu.c
diff --git
a/arch/ppc64/kernel/bpa_iommu.c
b/arch/ppc64/kernel/bpa_iommu.c
index
f33a7bc
..
da1b4b7
100644
(file)
--- a/
arch/ppc64/kernel/bpa_iommu.c
+++ b/
arch/ppc64/kernel/bpa_iommu.c
@@
-39,8
+39,8
@@
#include <asm/pmac_feature.h>
#include <asm/abs_addr.h>
#include <asm/system.h>
#include <asm/pmac_feature.h>
#include <asm/abs_addr.h>
#include <asm/system.h>
+#include <asm/ppc-pci.h>
-#include "pci.h"
#include "bpa_iommu.h"
static inline unsigned long
#include "bpa_iommu.h"
static inline unsigned long
@@
-99,7
+99,11
@@
get_iost_entry(unsigned long iopt_base, unsigned long io_address, unsigned page_
break;
default: /* not a known compile time constant */
break;
default: /* not a known compile time constant */
- BUILD_BUG_ON(1);
+ {
+ /* BUILD_BUG_ON() is not usable here */
+ extern void __get_iost_entry_bad_page_size(void);
+ __get_iost_entry_bad_page_size();
+ }
break;
}
break;
}
@@
-306,7
+310,7
@@
static void bpa_map_iommu(void)
static void *bpa_alloc_coherent(struct device *hwdev, size_t size,
static void *bpa_alloc_coherent(struct device *hwdev, size_t size,
- dma_addr_t *dma_handle,
unsigned int __nocas
t flag)
+ dma_addr_t *dma_handle,
gfp_
t flag)
{
void *ret;
{
void *ret;