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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
[pandora-kernel.git]
/
arch
/
x86
/
xen
/
grant-table.c
diff --git
a/arch/x86/xen/grant-table.c
b/arch/x86/xen/grant-table.c
index
6bbfd7a
..
5a40d24
100644
(file)
--- a/
arch/x86/xen/grant-table.c
+++ b/
arch/x86/xen/grant-table.c
@@
-71,7
+71,7
@@
int arch_gnttab_map_shared(unsigned long *frames, unsigned long nr_gframes,
if (shared == NULL) {
struct vm_struct *area =
if (shared == NULL) {
struct vm_struct *area =
- alloc_vm_area(PAGE_SIZE * max_nr_gframes);
+ alloc_vm_area(PAGE_SIZE * max_nr_gframes
, NULL
);
BUG_ON(area == NULL);
shared = area->addr;
*__shared = shared;
BUG_ON(area == NULL);
shared = area->addr;
*__shared = shared;