aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2009-08-05 10:16:57 +1000
committerDave Airlie <airlied@linux.ie>2009-08-05 10:16:57 +1000
commitb7f315842830d67081642248a3757c713b6b6684 (patch)
tree8606d4227532dccbd0accfa79321cd437fbe3922 /include/linux
parent90bc1a658a53f8832ee799685703977a450e5af9 (diff)
parent6a12235c7d2d75c7d94b9afcaaecd422ff845ce0 (diff)
downloadkernel_samsung_smdk4412-b7f315842830d67081642248a3757c713b6b6684.zip
kernel_samsung_smdk4412-b7f315842830d67081642248a3757c713b6b6684.tar.gz
kernel_samsung_smdk4412-b7f315842830d67081642248a3757c713b6b6684.tar.bz2
Merge git://git.infradead.org/~dwmw2/iommu-agp into agp-next
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/agp_backend.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/agp_backend.h b/include/linux/agp_backend.h
index 76fa794..880130f 100644
--- a/include/linux/agp_backend.h
+++ b/include/linux/agp_backend.h
@@ -79,9 +79,12 @@ struct agp_memory {
u32 physical;
bool is_bound;
bool is_flushed;
- bool vmalloc_flag;
+ bool vmalloc_flag;
/* list of agp_memory mapped to the aperture */
struct list_head mapped_list;
+ /* DMA-mapped addresses */
+ struct scatterlist *sg_list;
+ int num_sg;
};
#define AGP_NORMAL_MEMORY 0