The patch titled Xen-paravirt: paravirt_ops: allocate a fixmap slot has been added to the -mm tree. Its filename is xen-paravirt-paravirt_ops-allocate-a-fixmap-slot.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: Xen-paravirt: paravirt_ops: allocate a fixmap slot From: Jeremy Fitzhardinge <jeremy@xxxxxxxx> Allocate a fixmap slot for use by a paravirt_ops implementation. Xen uses this to map the hypervisor's shared info page, which doesn't have a pseudo-physical page number, and therefore can't be mapped ordinarily. Signed-off-by: Jeremy Fitzhardinge <jeremy@xxxxxxxxxxxxx> Cc: Zachary Amsden <zach@xxxxxxxxxx> Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx> Cc: Chris Wright <chrisw@xxxxxxxxxxxx> Cc: Andi Kleen <ak@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/asm-i386/fixmap.h | 3 +++ 1 file changed, 3 insertions(+) diff -puN include/asm-i386/fixmap.h~xen-paravirt-paravirt_ops-allocate-a-fixmap-slot include/asm-i386/fixmap.h --- a/include/asm-i386/fixmap.h~xen-paravirt-paravirt_ops-allocate-a-fixmap-slot +++ a/include/asm-i386/fixmap.h @@ -88,6 +88,9 @@ enum fixed_addresses { #ifdef CONFIG_PCI_MMCONFIG FIX_PCIE_MCFG, #endif +#ifdef CONFIG_PARAVIRT + FIX_PARAVIRT, +#endif __end_of_permanent_fixed_addresses, /* temporary boot-time mappings, used before ioremap() is functional */ #define NR_FIX_BTMAPS 16 _ Patches currently in -mm which might be from jeremy@xxxxxxxx are i386-probe_roms-cleanup.patch no-need-to-use-traditional-for-processing-asm-in-i386-kernel.patch xen-paravirt-fix-typo-in-sync_constant_test_bits-name.patch xen-paravirt-ignore-vgacon-if-hardware-not-present.patch xen-paravirt-add-pagetable-accessors-to-pack-and-unpack-pagetable-entries.patch xen-paravirt-paravirt_ops-hooks-to-set-up-initial-pagetable.patch xen-paravirt-paravirt_ops-allocate-a-fixmap-slot.patch xen-paravirt-remove-ctor-for-pgd-cache.patch xen-paravirt-allow-paravirt-backend-to-choose-kernel-pmd-sharing.patch xen-paravirt-allow-paravirt-backend-to-select-pgd-allocation-alignment.patch xen-paravirt-add-hooks-to-intercept-mm-creation-and-destruction.patch xen-paravirt-add-apply_to_page_range-which-applies-a-function-to-a-pte-range.patch xen-paravirt-allocate-and-free-vmalloc-areas.patch xen-paravirt-add-nosegneg-capability-to-the-vsyscall-page-notes.patch xen-paravirt-add-xen-config-options-and-disable-unsupported-config-options.patch xen-paravirt-add-xen-interface-header-files.patch xen-paravirt-core-xen-implementation.patch xen-paravirt-add-the-xen-virtual-console-driver.patch xen-paravirt-add-xen-grant-table-support.patch xen-paravirt-add-the-xenbus-sysfs-and-virtual-device-hotplug-driver.patch xen-paravirt-add-xen-virtual-block-device-driver.patch xen-paravirt-add-the-xen-virtual-network-device-driver.patch uninline-jiffiesh-functions.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html