diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 18:31:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 18:31:36 -0800 |
| commit | 06d381484fe8fb1ba2996c22e89595a273e3634c (patch) | |
| tree | 0d39c57cb8c501341ab8ed1d740f076b0b8c0bd0 /arch/x86/include/asm/xen | |
| parent | 5d5a8d2d9d6cca979efe4fe1552d787fdc542603 (diff) | |
| parent | c9d6369978411f690513994e6e53e2e6410874a4 (diff) | |
| download | blackbird-op-linux-06d381484fe8fb1ba2996c22e89595a273e3634c.tar.gz blackbird-op-linux-06d381484fe8fb1ba2996c22e89595a273e3634c.zip | |
Merge branch 'stable/vmalloc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/vmalloc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
net: xen-netback: use API provided by xenbus module to map rings
block: xen-blkback: use API provided by xenbus module to map rings
xen: use generic functions instead of xen_{alloc, free}_vm_area()
Diffstat (limited to 'arch/x86/include/asm/xen')
| -rw-r--r-- | arch/x86/include/asm/xen/grant_table.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/x86/include/asm/xen/grant_table.h b/arch/x86/include/asm/xen/grant_table.h deleted file mode 100644 index fdbbb45767a6..000000000000 --- a/arch/x86/include/asm/xen/grant_table.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _ASM_X86_XEN_GRANT_TABLE_H -#define _ASM_X86_XEN_GRANT_TABLE_H - -#define xen_alloc_vm_area(size) alloc_vm_area(size) -#define xen_free_vm_area(area) free_vm_area(area) - -#endif /* _ASM_X86_XEN_GRANT_TABLE_H */ |
