git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
cell
/
iommu.c
diff --git
a/arch/powerpc/platforms/cell/iommu.c
b/arch/powerpc/platforms/cell/iommu.c
index
58b13ce
..
26a0671
100644
(file)
--- a/
arch/powerpc/platforms/cell/iommu.c
+++ b/
arch/powerpc/platforms/cell/iommu.c
@@
-477,7
+477,7
@@
cell_iommu_setup_window(struct cbe_iommu *iommu, struct device_node *np,
ioid = cell_iommu_get_ioid(np);
- window = k
m
alloc_node(sizeof(*window), GFP_KERNEL, iommu->nid);
+ window = k
z
alloc_node(sizeof(*window), GFP_KERNEL, iommu->nid);
BUG_ON(window == NULL);
window->offset = offset;