fix build of xen-gntdev.ko
This commit is contained in:
parent
ee6c061eb9
commit
c55a797910
@ -732,6 +732,8 @@ Patch12401: debug-tty-print-dev-name.patch
|
|||||||
|
|
||||||
Patch12421: fs-call-security_d_instantiate-in-d_obtain_alias.patch
|
Patch12421: fs-call-security_d_instantiate-in-d_obtain_alias.patch
|
||||||
|
|
||||||
|
Patch12422: xen_export-arbitrary_virt_to_machine.patch
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
|
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
|
||||||
@ -1344,6 +1346,8 @@ ApplyPatch debug-tty-print-dev-name.patch
|
|||||||
# rhbz#662344,600690
|
# rhbz#662344,600690
|
||||||
ApplyPatch fs-call-security_d_instantiate-in-d_obtain_alias.patch
|
ApplyPatch fs-call-security_d_instantiate-in-d_obtain_alias.patch
|
||||||
|
|
||||||
|
ApplyPatch xen_export-arbitrary_virt_to_machine.patch
|
||||||
|
|
||||||
# END OF PATCH APPLICATIONS
|
# END OF PATCH APPLICATIONS
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
@ -1956,6 +1960,10 @@ fi
|
|||||||
# ||----w |
|
# ||----w |
|
||||||
# || ||
|
# || ||
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jan 14 2011 Kyle McMartin <kmcmartin@redhat.com>
|
||||||
|
- xen_export-arbitrary_virt_to_machine.patch: pull patch from upstream
|
||||||
|
to fix build error.
|
||||||
|
|
||||||
* Fri Jan 14 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38-0.rc0.git12.1
|
* Fri Jan 14 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38-0.rc0.git12.1
|
||||||
- Linux 2.6.37-git12
|
- Linux 2.6.37-git12
|
||||||
- 0001-use-__devexit-not-__exit-in-n2_unregister_algs-fixes.patch: drop
|
- 0001-use-__devexit-not-__exit-in-n2_unregister_algs-fixes.patch: drop
|
||||||
|
25
xen_export-arbitrary_virt_to_machine.patch
Normal file
25
xen_export-arbitrary_virt_to_machine.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
commit de23be5f3580f7b9b52cad6633bb3a3cd13abafe
|
||||||
|
Author: Stephen Rothwell <sfr@canb.auug.org.au>
|
||||||
|
Date: Sat Jan 15 10:36:26 2011 +1100
|
||||||
|
|
||||||
|
xen: export arbitrary_virt_to_machine
|
||||||
|
|
||||||
|
Fixes this build error:
|
||||||
|
|
||||||
|
ERROR: "arbitrary_virt_to_machine" [drivers/xen/xen-gntdev.ko] undefined!
|
||||||
|
|
||||||
|
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
|
||||||
|
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
||||||
|
|
||||||
|
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
|
||||||
|
index 7575e55..5e92b61 100644
|
||||||
|
--- a/arch/x86/xen/mmu.c
|
||||||
|
+++ b/arch/x86/xen/mmu.c
|
||||||
|
@@ -201,6 +201,7 @@ xmaddr_t arbitrary_virt_to_machine(void *vaddr)
|
||||||
|
offset = address & ~PAGE_MASK;
|
||||||
|
return XMADDR(((phys_addr_t)pte_mfn(*pte) << PAGE_SHIFT) + offset);
|
||||||
|
}
|
||||||
|
+EXPORT_SYMBOL_GPL(arbitrary_virt_to_machine);
|
||||||
|
|
||||||
|
void make_lowmem_page_readonly(void *vaddr)
|
||||||
|
{
|
Loading…
Reference in New Issue
Block a user