The patch titled git-x86-fixup has been added to the -mm tree. Its filename is git-x86-fixup.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** 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 The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: git-x86-fixup From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/x86/mm/ioremap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN arch/x86/mm/ioremap.c~git-x86-fixup arch/x86/mm/ioremap.c --- a/arch/x86/mm/ioremap.c~git-x86-fixup +++ a/arch/x86/mm/ioremap.c @@ -148,7 +148,7 @@ static void __iomem *__ioremap_caller(re /* * Don't allow anybody to remap normal RAM that we're using.. */ - for (pfn = phys_addr >> PAGE_SHIFT; + for (pfn = phys_addr >> PAGE_SHIFT; pfn < max_pfn_mapped && (pfn << PAGE_SHIFT) < (last_addr & PAGE_MASK); pfn++) { _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch sgi-altix-mmtimer-allow-larger-number-of-timers-per-node.patch epcac-static-functions-and-integer-as-null-pointer-fixes.patch isicom-bring-into-coding-style.patch tty-the-big-operations-rework.patch devpts-factor-out-pty-index-allocation.patch mm-bdi-export-bdi-attributes-in-sysfs.patch fuse-fix-race-in-llseek.patch basic-braille-screen-reader-support.patch hfs-fix-warning-with-64k-page_size.patch hfsplus-fix-warning-with-64k-page_size.patch alloc_uid-cleanup.patch add-macros-similar-to-min-max-min_t-max_t.patch revert-memory-hotplug-allocate-usemap-on-the-section-with-pgdat.patch pci-export-resource_wc-in-pci-sysfs-fix.patch disable-the-memory-controller-by-default-v3.patch git-acpi.patch acpi-enable-c3-power-state-on-dell-inspiron-8200.patch git-x86-fixup.patch rtc-remove-unneeded-declarations-of-hpet_rtc_interrupt.patch x86-geode-cache-results-from-geode_has_vsa2-and-uninline-cleanup.patch git-arm-fixup.patch cifs-suppress-warning.patch devres-support-addresses-greater-than-an-unsigned-long-via-dev_ioremap-checkpatch-fixes.patch sysfs-provide-a-clue-about-the-effects-of-config_usb_device_class=y.patch tuner_symbol_probe-dont-do-symbol_put-if-symbol_request-failed.patch drivers-media-video-tuner-corec-tuner_probe-fix-error-check.patch i2c-renesas-highlander-fpga-smbus-support.patch git-hwmon.patch touch-screen-driver-for-the-superh-migor-board.patch git-kvm.patch pata_atiixp-simplex-clear.patch git-m32r.patch git-mips.patch git-mips-git-rejects.patch git-mmc.patch sundance-set-carrier-status-on-link-change-events.patch update-smc91x-driver-with-arm-versatile-board-info.patch fs-nfs-callback_xdrc-suppress-uninitialiized-variable-warnings.patch arch-parisc-kernel-unalignedc-use-time_-macros.patch drivers-pcmcia-soc_commonc-convert-soc_pcmcia_sockets_lock-into-a-mutex-and-make-it-static.patch pci-hotplug-introduce-pci_slot.patch pci-hotplug-acpi-pci-slot-detection-driver.patch sched-add-debug-checks-to-idle-functions.patch drivers-base-topologyc-add-conditionals-around-show_cpumap.patch add-rcu_assign_index-if-ever-needed.patch git-scsi-misc.patch scsi-fix-section-mismatch-in-aic94xx.patch drivers-scsi-mvsasc-fix-build-warnings.patch aic79xx_core-remove-ascii-art.patch sparc32-export-empty_zero_page.patch git-unionfs.patch git-v9fs.patch git-watchdog.patch git-watchdog-git-rejects.patch xfs-suppress-uninitialized-var-warnings.patch git-xtensa.patch make-module_sect_attrs-private-to-kernel-modulec-checkpatch-fixes.patch ext4-is-busted-on-m68k.patch vmscan-give-referenced-active-and-unmapped-pages-a-second-trip-around-the-lru.patch vm-dont-run-touch_buffer-during-buffercache-lookups.patch utimensat-non-conformances-and-fixes-checkpatch-fixes.patch add-warn_on_secs-macro.patch documentation-build-source-files-in-documentation-sub-dir-disable.patch sxc-fix-printk-warnings-on-sparc32.patch reiser4.patch jens-broke-reiser4patch-added-to-mm-tree.patch page-owner-tracking-leak-detector.patch nr_blockdev_pages-in_interrupt-warning.patch slab-leaks3-default-y.patch put_bh-debug.patch shrink_slab-handle-bad-shrinkers.patch getblk-handle-2tb-devices.patch getblk-handle-2tb-devices-fix.patch undeprecate-pci_find_device.patch notify_change-callers-must-hold-i_mutex.patch x86-ioremap-add-checks-for-virtual-addresses-fix.patch profile-likely-unlikely-macros.patch drivers-net-bonding-bond_sysfsc-suppress-uninitialized-var-warning.patch w1-build-fix.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