diff --git a/kernel.spec b/kernel.spec index 7925d2bf0..d88ce6bfc 100644 --- a/kernel.spec +++ b/kernel.spec @@ -745,6 +745,8 @@ Patch12421: fs-call-security_d_instantiate-in-d_obtain_alias.patch # git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git branches #Patch20005: xen.pcifront.fixes.patch Patch20006: xen.pcifront.next-2.6.38.patch +# build fix +Patch20007: p2mfix.patch # git://xenbits.xen.org/people/sstabellini/linux-pvhvm branches #Patch20010: xen.pvhvm.fixes.patch @@ -1383,6 +1385,7 @@ ApplyPatch fs-call-security_d_instantiate-in-d_obtain_alias.patch #ApplyPatch xen.upstream.core.patch #ApplyPatch xen.pcifront.fixes.patch ApplyPatch xen.pcifront.next-2.6.38.patch +ApplyPatch p2mfix.patch #ApplyPatch xen.pvhvm.fixes.patch # END OF PATCH APPLICATIONS @@ -1998,6 +2001,7 @@ fi for ease of maintenance patch is git diff v2.6.38...3d67ff0c8f180f2cc4ade645f6f9571b26816e5a - set new xen-blkback to be a module CONFIG_XEN_BLKDEV_BACKEND=m +- add patch to allow xen-blkback to build as module * Tue Mar 15 2011 Adam Jackson - drm-intel-big-hammer.patch: Drop. diff --git a/p2mfix.patch b/p2mfix.patch new file mode 100644 index 000000000..9aad587a0 --- /dev/null +++ b/p2mfix.patch @@ -0,0 +1,18 @@ +--- linux-2.6.38.x86_64/arch/x86/xen/p2m.c.orig 2011-03-15 19:51:44.000000000 +0000 ++++ linux-2.6.38.x86_64/arch/x86/xen/p2m.c 2011-03-15 20:38:38.000000000 +0000 +@@ -557,6 +557,7 @@ + + return 0; + } ++EXPORT_SYMBOL_GPL(m2p_add_override); + + int m2p_remove_override(struct page *page, bool clear_pte) + { +@@ -594,6 +595,7 @@ + + return 0; + } ++EXPORT_SYMBOL_GPL(m2p_remove_override); + + struct page *m2p_find_override(unsigned long mfn) + {