The patch titled huge-page-private-reservation-review-cleanups-fix has been removed from the -mm tree. Its filename was huge-page-private-reservation-review-cleanups-fix.patch This patch was dropped because it was folded into huge-page-private-reservation-review-cleanups.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: huge-page-private-reservation-review-cleanups-fix From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Make things static. Cc: Adam Litke <agl@xxxxxxxxxx> Cc: Andy Whitcroft <apw@xxxxxxxxxxxx> Cc: Hugh Dickins <hugh@xxxxxxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxxx> Cc: Mel Gorman <mel@xxxxxxxxx> Cc: Michael Kerrisk <mtk.manpages@xxxxxxxxxxxxxx> Cc: William Lee Irwin III <wli@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/hugetlb.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff -puN mm/hugetlb.c~huge-page-private-reservation-review-cleanups-fix mm/hugetlb.c --- a/mm/hugetlb.c~huge-page-private-reservation-review-cleanups-fix +++ a/mm/hugetlb.c @@ -44,7 +44,8 @@ static DEFINE_SPINLOCK(hugetlb_lock); * Convert the address within this vma to the page offset within * the mapping, in base page units. */ -pgoff_t vma_page_offset(struct vm_area_struct *vma, unsigned long address) +static pgoff_t vma_page_offset(struct vm_area_struct *vma, + unsigned long address) { return ((address - vma->vm_start) >> PAGE_SHIFT) + (vma->vm_pgoff >> PAGE_SHIFT); @@ -54,7 +55,8 @@ pgoff_t vma_page_offset(struct vm_area_s * Convert the address within this vma to the page offset within * the mapping, in pagecache page units; huge pages here. */ -pgoff_t vma_pagecache_offset(struct vm_area_struct *vma, unsigned long address) +static pgoff_t vma_pagecache_offset(struct vm_area_struct *vma, + unsigned long address) { return ((address - vma->vm_start) >> HPAGE_SHIFT) + (vma->vm_pgoff >> (HPAGE_SHIFT - PAGE_SHIFT)); _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch mm-verify-the-page-links-and-memory-model.patch mspec-convert-nopfn-to-fault.patch page-allocator-inlnie-some-__alloc_pages-wrappers.patch kill-generic_file_direct_io.patch use-generic_access_phys-for-dev-mem-mappings.patch spufs-use-the-new-vm_ops-access.patch fix-soft-lock-up-at-nfs-mount-by-per-sb-lru-list-of-unused-dentries.patch page-flags-record-page-flag-overlays-explicitly.patch mapping_set_error-add-unlikely.patch huge-page-private-reservation-review-cleanups.patch huge-page-private-reservation-review-cleanups-fix.patch vma-page-offset-has-no-callees-drop-it.patch sync_file_range_write-may-and-will-block-document-that-fix.patch vmallocinfo-add-numa-information-fix.patch hugetlb-modular-state-for-hugetlb-page-size-checkpatch-fixes.patch hugetlb-multiple-hstates-for-multiple-page-sizes-checkpatch-fixes.patch hugetlb-override-default-huge-page-size-non-const-fix-fix.patch linux-next-revert-bootmem-add-return-value-to-reserve_bootmem_node.patch revert-linux-next-revert-bootmem-add-return-value-to-reserve_bootmem_node.patch revert-revert-linux-next-revert-bootmem-add-return-value-to-reserve_bootmem_node.patch revert-revert-revert-linux-next-revert-bootmem-add-return-value-to-reserve_bootmem_node.patch bootmem-add-debugging-framework-fix.patch bootmem-clean-up-free_all_bootmem_core-fix.patch bootmem-free-reserve-helpers-fix.patch revert-revert-revert-revert-linux-next-revert-bootmem-add-return-value-to-reserve_bootmem_node.patch bootmem-factor-out-the-marking-of-a-pfn-range-fix.patch page_align-correctly-handle-64-bit-values-on-32-bit-architectures-fix.patch page_align-correctly-handle-64-bit-values-on-32-bit-architectures-v850-fix.patch page_align-correctly-handle-64-bit-values-on-32-bit-architectures-powerpc-fix.patch page_align-correctly-handle-64-bit-values-on-32-bit-architectures-arm-fix.patch page_align-correctly-handle-64-bit-values-on-32-bit-architectures-mips-fix.patch page_align-correctly-handle-64-bit-values-on-32-bit-architectures-dvb.patch page_align-correctly-handle-64-bit-values-on-32-bit-architectures-mtd-fix.patch page_align-correctly-handle-64-bit-values-on-32-bit-architectures-powerpc-fixes.patch mmu-notifiers-add-mm_take_all_locks-operation-checkpatch-fixes.patch mmu-notifier-core-checkpatch-fixes.patch mmu-notifier-core-fix.patch mmu-notifier-core-fix-2.patch security-protect-legacy-apps-from-insufficient-privilege-cleanup.patch security-protect-legacy-applications-from-executing-with-insufficient-privilege-checkpatch-fixes.patch swsusp-provide-users-with-a-hint-about-the-no_console_suspend-option-fix.patch flag-parameters-paccept-fix.patch flag-parameters-paccept-sys_ni.patch flag-parameters-anon_inode_getfd-extension-fix.patch flag-parameters-signalfd-fix.patch flag-parameters-eventfd-fix.patch flag-parameters-inotify_init-fix.patch flag-parameters-check-magic-constants-alpha.patch spi-au1550_spi-improve-pio-transfer-mode-checkpatch-fixes.patch autofs4-use-lookup-intent-flags-to-trigger-mounts-fix.patch rtc-cmos-improve-hpet-irq-glue-build-fix.patch drivers-video-aty-radeon_basec-notify-user-if-sysfs_create_bin_file-failed-checkpatch-fixes.patch atmel_lcdfb-avoid-division-by-zero-checkpatch-fixes.patch sm501-fixup-allocation-code-to-be-64bit-resource-compliant-sm501-align-panel-fb-to-page_size-fix.patch lcd-add-platform_lcd-driver-fix.patch fsl-diu-fb-update-freescale-diu-driver-to-use-page_alloc_exact.patch fbdev-add-new-cobalt-lcd-framebuffer-driver.patch fbcon-remove-stray-semicolons-checkpatch-fixes.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