diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/xen/grant-table.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index 5d4de88fe5b8..eeba7544f0cd 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c | |||
| @@ -1195,18 +1195,20 @@ static int gnttab_expand(unsigned int req_entries) | |||
| 1195 | int gnttab_init(void) | 1195 | int gnttab_init(void) |
| 1196 | { | 1196 | { |
| 1197 | int i; | 1197 | int i; |
| 1198 | unsigned long max_nr_grant_frames; | ||
| 1198 | unsigned int max_nr_glist_frames, nr_glist_frames; | 1199 | unsigned int max_nr_glist_frames, nr_glist_frames; |
| 1199 | unsigned int nr_init_grefs; | 1200 | unsigned int nr_init_grefs; |
| 1200 | int ret; | 1201 | int ret; |
| 1201 | 1202 | ||
| 1202 | gnttab_request_version(); | 1203 | gnttab_request_version(); |
| 1204 | max_nr_grant_frames = gnttab_max_grant_frames(); | ||
| 1203 | nr_grant_frames = 1; | 1205 | nr_grant_frames = 1; |
| 1204 | 1206 | ||
| 1205 | /* Determine the maximum number of frames required for the | 1207 | /* Determine the maximum number of frames required for the |
| 1206 | * grant reference free list on the current hypervisor. | 1208 | * grant reference free list on the current hypervisor. |
| 1207 | */ | 1209 | */ |
| 1208 | BUG_ON(grefs_per_grant_frame == 0); | 1210 | BUG_ON(grefs_per_grant_frame == 0); |
| 1209 | max_nr_glist_frames = (gnttab_max_grant_frames() * | 1211 | max_nr_glist_frames = (max_nr_grant_frames * |
| 1210 | grefs_per_grant_frame / RPP); | 1212 | grefs_per_grant_frame / RPP); |
| 1211 | 1213 | ||
| 1212 | gnttab_list = kmalloc(max_nr_glist_frames * sizeof(grant_ref_t *), | 1214 | gnttab_list = kmalloc(max_nr_glist_frames * sizeof(grant_ref_t *), |
| @@ -1223,6 +1225,11 @@ int gnttab_init(void) | |||
| 1223 | } | 1225 | } |
| 1224 | } | 1226 | } |
| 1225 | 1227 | ||
| 1228 | ret = arch_gnttab_init(max_nr_grant_frames, | ||
| 1229 | nr_status_frames(max_nr_grant_frames)); | ||
| 1230 | if (ret < 0) | ||
| 1231 | goto ini_nomem; | ||
| 1232 | |||
| 1226 | if (gnttab_setup() < 0) { | 1233 | if (gnttab_setup() < 0) { |
| 1227 | ret = -ENODEV; | 1234 | ret = -ENODEV; |
| 1228 | goto ini_nomem; | 1235 | goto ini_nomem; |
