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 branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
alpha
/
kernel
/
core_titan.c
diff --git
a/arch/alpha/kernel/core_titan.c
b/arch/alpha/kernel/core_titan.c
index
319fcb7
..
7668649
100644
(file)
--- a/
arch/alpha/kernel/core_titan.c
+++ b/
arch/alpha/kernel/core_titan.c
@@
-680,7
+680,7
@@
titan_agp_bind_memory(alpha_agp_info *agp, off_t pg_start, struct agp_memory *me
{
struct titan_agp_aperture *aper = agp->aperture.sysdata;
return iommu_bind(aper->arena, aper->pg_start + pg_start,
- mem->page_count, mem->
memory
);
+ mem->page_count, mem->
pages
);
}
static int