The patch titled Subject: asm-generic-fix-wtype-limits-compiler-warnings-fix has been removed from the -mm tree. Its filename was asm-generic-fix-wtype-limits-compiler-warnings-fix.patch This patch was dropped because it was folded into asm-generic-fix-wtype-limits-compiler-warnings.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: asm-generic-fix-wtype-limits-compiler-warnings-fix remove __get_order() altogether Cc: Qian Cai <cai@xxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/asm-generic/getorder.h | 53 ++++++++++++------------------- 1 file changed, 22 insertions(+), 31 deletions(-) --- a/include/asm-generic/getorder.h~asm-generic-fix-wtype-limits-compiler-warnings-fix +++ a/include/asm-generic/getorder.h @@ -7,11 +7,29 @@ #include <linux/compiler.h> #include <linux/log2.h> -/* - * Runtime evaluation of get_order() +/** + * get_order - Determine the allocation order of a memory size + * @size: The size for which to get the order + * + * Determine the allocation order of a particular sized block of memory. This + * is on a logarithmic scale, where: + * + * 0 -> 2^0 * PAGE_SIZE and below + * 1 -> 2^1 * PAGE_SIZE to 2^0 * PAGE_SIZE + 1 + * 2 -> 2^2 * PAGE_SIZE to 2^1 * PAGE_SIZE + 1 + * 3 -> 2^3 * PAGE_SIZE to 2^2 * PAGE_SIZE + 1 + * 4 -> 2^4 * PAGE_SIZE to 2^3 * PAGE_SIZE + 1 + * ... + * + * The order returned is used to find the smallest allocation granule required + * to hold an object of the specified size. + * + * The result is undefined if the size is 0. + * + * This function may be used to initialise variables with compile time + * evaluations of constants. */ -static inline __attribute_const__ -int __get_order(unsigned long size) +static inline __attribute_const__ int get_order(unsigned long size) { int order; @@ -35,33 +53,6 @@ int __get_order(unsigned long size) return order; } -/** - * get_order - Determine the allocation order of a memory size - * @size: The size for which to get the order - * - * Determine the allocation order of a particular sized block of memory. This - * is on a logarithmic scale, where: - * - * 0 -> 2^0 * PAGE_SIZE and below - * 1 -> 2^1 * PAGE_SIZE to 2^0 * PAGE_SIZE + 1 - * 2 -> 2^2 * PAGE_SIZE to 2^1 * PAGE_SIZE + 1 - * 3 -> 2^3 * PAGE_SIZE to 2^2 * PAGE_SIZE + 1 - * 4 -> 2^4 * PAGE_SIZE to 2^3 * PAGE_SIZE + 1 - * ... - * - * The order returned is used to find the smallest allocation granule required - * to hold an object of the specified size. - * - * The result is undefined if the size is 0. - * - * This function may be used to initialise variables with compile time - * evaluations of constants. - */ -#define get_order(n) \ -( \ - __get_order(n) \ -) - #endif /* __ASSEMBLY__ */ #endif /* __ASM_GENERIC_GETORDER_H */ _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are asm-generic-fix-wtype-limits-compiler-warnings.patch drivers-acpi-scanc-document-why-we-dont-need-the-device_hotplug_lock-fix.patch fs-ocfs2-fix-possible-null-pointer-dereferences-in-ocfs2_xa_prepare_entry-fix.patch ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch mm.patch mm-introduce-page_shift-fix.patch mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix.patch mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix-fix.patch mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix-fix-fix.patch mm-memory_hotplug-remove-move_pfn_range-fix.patch mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone-fix-fix.patch mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone-fix-2-fix.patch mm-oom-avoid-printk-iteration-under-rcu-fix.patch mm-oom_killer-add-task-uid-to-info-message-on-an-oom-kill-fix.patch psi-annotate-refault-stalls-from-io-submission-fix.patch psi-annotate-refault-stalls-from-io-submission-fix-2.patch linux-next-rejects.patch linux-next-git-rejects.patch diff-sucks.patch drivers-tty-serial-sh-scic-suppress-warning.patch kernel-forkc-export-kernel_thread-to-modules.patch