The patch titled implement-a-general-integer-log2-facility-in-the-kernel safety has been removed from the -mm tree. Its filename is implement-a-general-integer-log2-facility-in-the-kernel-safety.patch This patch was dropped because it had testing failures ------------------------------------------------------ Subject: implement-a-general-integer-log2-facility-in-the-kernel safety From: Andrew Morton <akpm@xxxxxxxx> Cc: David Howells <dhowells@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- include/linux/log2.h | 196 ++++++++++++++++++++--------------------- 1 files changed, 98 insertions(+), 98 deletions(-) diff -puN include/linux/log2.h~implement-a-general-integer-log2-facility-in-the-kernel-safety include/linux/log2.h --- a/include/linux/log2.h~implement-a-general-integer-log2-facility-in-the-kernel-safety +++ a/include/linux/log2.h @@ -53,39 +53,39 @@ int __ilog2_u64(u64 n) #define ilog2_u32(n) \ ( \ __builtin_constant_p(n) ? ( \ - n < 1 ? ____ilog2_NaN() : \ - n >= (1ULL << 31) ? 31 : \ - n >= (1ULL << 30) ? 30 : \ - n >= (1ULL << 29) ? 29 : \ - n >= (1ULL << 28) ? 28 : \ - n >= (1ULL << 27) ? 27 : \ - n >= (1ULL << 26) ? 26 : \ - n >= (1ULL << 25) ? 25 : \ - n >= (1ULL << 24) ? 24 : \ - n >= (1ULL << 23) ? 23 : \ - n >= (1ULL << 22) ? 22 : \ - n >= (1ULL << 21) ? 21 : \ - n >= (1ULL << 20) ? 20 : \ - n >= (1ULL << 19) ? 19 : \ - n >= (1ULL << 18) ? 18 : \ - n >= (1ULL << 17) ? 17 : \ - n >= (1ULL << 16) ? 16 : \ - n >= (1ULL << 15) ? 15 : \ - n >= (1ULL << 14) ? 14 : \ - n >= (1ULL << 13) ? 13 : \ - n >= (1ULL << 12) ? 12 : \ - n >= (1ULL << 11) ? 11 : \ - n >= (1ULL << 10) ? 10 : \ - n >= (1ULL << 9) ? 9 : \ - n >= (1ULL << 8) ? 8 : \ - n >= (1ULL << 7) ? 7 : \ - n >= (1ULL << 6) ? 6 : \ - n >= (1ULL << 5) ? 5 : \ - n >= (1ULL << 4) ? 4 : \ - n >= (1ULL << 3) ? 3 : \ - n >= (1ULL << 2) ? 2 : \ - n >= (1ULL << 1) ? 1 : \ - n >= (1ULL << 0) ? 0 : \ + (n) < 1 ? ____ilog2_NaN() : \ + (n) >= (1ULL << 31) ? 31 : \ + (n) >= (1ULL << 30) ? 30 : \ + (n) >= (1ULL << 29) ? 29 : \ + (n) >= (1ULL << 28) ? 28 : \ + (n) >= (1ULL << 27) ? 27 : \ + (n) >= (1ULL << 26) ? 26 : \ + (n) >= (1ULL << 25) ? 25 : \ + (n) >= (1ULL << 24) ? 24 : \ + (n) >= (1ULL << 23) ? 23 : \ + (n) >= (1ULL << 22) ? 22 : \ + (n) >= (1ULL << 21) ? 21 : \ + (n) >= (1ULL << 20) ? 20 : \ + (n) >= (1ULL << 19) ? 19 : \ + (n) >= (1ULL << 18) ? 18 : \ + (n) >= (1ULL << 17) ? 17 : \ + (n) >= (1ULL << 16) ? 16 : \ + (n) >= (1ULL << 15) ? 15 : \ + (n) >= (1ULL << 14) ? 14 : \ + (n) >= (1ULL << 13) ? 13 : \ + (n) >= (1ULL << 12) ? 12 : \ + (n) >= (1ULL << 11) ? 11 : \ + (n) >= (1ULL << 10) ? 10 : \ + (n) >= (1ULL << 9) ? 9 : \ + (n) >= (1ULL << 8) ? 8 : \ + (n) >= (1ULL << 7) ? 7 : \ + (n) >= (1ULL << 6) ? 6 : \ + (n) >= (1ULL << 5) ? 5 : \ + (n) >= (1ULL << 4) ? 4 : \ + (n) >= (1ULL << 3) ? 3 : \ + (n) >= (1ULL << 2) ? 2 : \ + (n) >= (1ULL << 1) ? 1 : \ + (n) >= (1ULL << 0) ? 0 : \ ____ilog2_NaN() \ ) : \ __ilog2_u32(n) \ @@ -102,71 +102,71 @@ int __ilog2_u64(u64 n) #define ilog2_u64(n) \ ( \ __builtin_constant_p(n) ? ( \ - n < 1 ? ____ilog2_NaN() : \ - n >= (1ULL << 63) ? 63 : \ - n >= (1ULL << 62) ? 62 : \ - n >= (1ULL << 61) ? 61 : \ - n >= (1ULL << 60) ? 60 : \ - n >= (1ULL << 59) ? 59 : \ - n >= (1ULL << 58) ? 58 : \ - n >= (1ULL << 57) ? 57 : \ - n >= (1ULL << 56) ? 56 : \ - n >= (1ULL << 55) ? 55 : \ - n >= (1ULL << 54) ? 54 : \ - n >= (1ULL << 53) ? 53 : \ - n >= (1ULL << 52) ? 52 : \ - n >= (1ULL << 51) ? 51 : \ - n >= (1ULL << 50) ? 50 : \ - n >= (1ULL << 49) ? 49 : \ - n >= (1ULL << 48) ? 48 : \ - n >= (1ULL << 47) ? 47 : \ - n >= (1ULL << 46) ? 46 : \ - n >= (1ULL << 45) ? 45 : \ - n >= (1ULL << 44) ? 44 : \ - n >= (1ULL << 43) ? 43 : \ - n >= (1ULL << 42) ? 42 : \ - n >= (1ULL << 41) ? 41 : \ - n >= (1ULL << 40) ? 40 : \ - n >= (1ULL << 39) ? 39 : \ - n >= (1ULL << 38) ? 38 : \ - n >= (1ULL << 37) ? 37 : \ - n >= (1ULL << 36) ? 36 : \ - n >= (1ULL << 35) ? 35 : \ - n >= (1ULL << 34) ? 34 : \ - n >= (1ULL << 33) ? 33 : \ - n >= (1ULL << 32) ? 32 : \ - n >= (1ULL << 31) ? 31 : \ - n >= (1ULL << 30) ? 30 : \ - n >= (1ULL << 29) ? 29 : \ - n >= (1ULL << 28) ? 28 : \ - n >= (1ULL << 27) ? 27 : \ - n >= (1ULL << 26) ? 26 : \ - n >= (1ULL << 25) ? 25 : \ - n >= (1ULL << 24) ? 24 : \ - n >= (1ULL << 23) ? 23 : \ - n >= (1ULL << 22) ? 22 : \ - n >= (1ULL << 21) ? 21 : \ - n >= (1ULL << 20) ? 20 : \ - n >= (1ULL << 19) ? 19 : \ - n >= (1ULL << 18) ? 18 : \ - n >= (1ULL << 17) ? 17 : \ - n >= (1ULL << 16) ? 16 : \ - n >= (1ULL << 15) ? 15 : \ - n >= (1ULL << 14) ? 14 : \ - n >= (1ULL << 13) ? 13 : \ - n >= (1ULL << 12) ? 12 : \ - n >= (1ULL << 11) ? 11 : \ - n >= (1ULL << 10) ? 10 : \ - n >= (1ULL << 9) ? 9 : \ - n >= (1ULL << 8) ? 8 : \ - n >= (1ULL << 7) ? 7 : \ - n >= (1ULL << 6) ? 6 : \ - n >= (1ULL << 5) ? 5 : \ - n >= (1ULL << 4) ? 4 : \ - n >= (1ULL << 3) ? 3 : \ - n >= (1ULL << 2) ? 2 : \ - n >= (1ULL << 1) ? 1 : \ - n >= (1ULL << 0) ? 0 : \ + (n) < 1 ? ____ilog2_NaN() : \ + (n) >= (1ULL << 63) ? 63 : \ + (n) >= (1ULL << 62) ? 62 : \ + (n) >= (1ULL << 61) ? 61 : \ + (n) >= (1ULL << 60) ? 60 : \ + (n) >= (1ULL << 59) ? 59 : \ + (n) >= (1ULL << 58) ? 58 : \ + (n) >= (1ULL << 57) ? 57 : \ + (n) >= (1ULL << 56) ? 56 : \ + (n) >= (1ULL << 55) ? 55 : \ + (n) >= (1ULL << 54) ? 54 : \ + (n) >= (1ULL << 53) ? 53 : \ + (n) >= (1ULL << 52) ? 52 : \ + (n) >= (1ULL << 51) ? 51 : \ + (n) >= (1ULL << 50) ? 50 : \ + (n) >= (1ULL << 49) ? 49 : \ + (n) >= (1ULL << 48) ? 48 : \ + (n) >= (1ULL << 47) ? 47 : \ + (n) >= (1ULL << 46) ? 46 : \ + (n) >= (1ULL << 45) ? 45 : \ + (n) >= (1ULL << 44) ? 44 : \ + (n) >= (1ULL << 43) ? 43 : \ + (n) >= (1ULL << 42) ? 42 : \ + (n) >= (1ULL << 41) ? 41 : \ + (n) >= (1ULL << 40) ? 40 : \ + (n) >= (1ULL << 39) ? 39 : \ + (n) >= (1ULL << 38) ? 38 : \ + (n) >= (1ULL << 37) ? 37 : \ + (n) >= (1ULL << 36) ? 36 : \ + (n) >= (1ULL << 35) ? 35 : \ + (n) >= (1ULL << 34) ? 34 : \ + (n) >= (1ULL << 33) ? 33 : \ + (n) >= (1ULL << 32) ? 32 : \ + (n) >= (1ULL << 31) ? 31 : \ + (n) >= (1ULL << 30) ? 30 : \ + (n) >= (1ULL << 29) ? 29 : \ + (n) >= (1ULL << 28) ? 28 : \ + (n) >= (1ULL << 27) ? 27 : \ + (n) >= (1ULL << 26) ? 26 : \ + (n) >= (1ULL << 25) ? 25 : \ + (n) >= (1ULL << 24) ? 24 : \ + (n) >= (1ULL << 23) ? 23 : \ + (n) >= (1ULL << 22) ? 22 : \ + (n) >= (1ULL << 21) ? 21 : \ + (n) >= (1ULL << 20) ? 20 : \ + (n) >= (1ULL << 19) ? 19 : \ + (n) >= (1ULL << 18) ? 18 : \ + (n) >= (1ULL << 17) ? 17 : \ + (n) >= (1ULL << 16) ? 16 : \ + (n) >= (1ULL << 15) ? 15 : \ + (n) >= (1ULL << 14) ? 14 : \ + (n) >= (1ULL << 13) ? 13 : \ + (n) >= (1ULL << 12) ? 12 : \ + (n) >= (1ULL << 11) ? 11 : \ + (n) >= (1ULL << 10) ? 10 : \ + (n) >= (1ULL << 9) ? 9 : \ + (n) >= (1ULL << 8) ? 8 : \ + (n) >= (1ULL << 7) ? 7 : \ + (n) >= (1ULL << 6) ? 6 : \ + (n) >= (1ULL << 5) ? 5 : \ + (n) >= (1ULL << 4) ? 4 : \ + (n) >= (1ULL << 3) ? 3 : \ + (n) >= (1ULL << 2) ? 2 : \ + (n) >= (1ULL << 1) ? 1 : \ + (n) >= (1ULL << 0) ? 0 : \ ____ilog2_NaN() \ ) : \ __ilog2_u64(n) \ _ Patches currently in -mm which might be from akpm@xxxxxxxx are origin.patch git-acpi.patch acpi-asus-s3-resume-fix.patch sony_apci-resume.patch kauditd_thread-warning-fix.patch git-block.patch git-block-hack.patch gregkh-driver-input-device-a3d-fix.patch gregkh-driver-input-device-more-fixes.patch gregkh-driver-input-device-even-more-fixes.patch gregkh-driver-input-device-even-more-fixes-2.patch gregkh-driver-fb-device-fixes.patch more-driver-tree-fixes.patch scsi-device_reprobe-can-fail.patch git-drm.patch git-dvb.patch git-dvb-fixup.patch dvb-usb-vs-driver-tree.patch git-gfs2.patch git-ia64.patch git-ieee1394.patch stowaway-vs-driver-tree.patch git-intelfb-fixup.patch git-kbuild.patch hdrcheck-permission-fix.patch git-libata-all.patch 1-of-2-jmicron-driver-fix.patch via-pata-controller-xfer-fixes-fix.patch git-magic-fixup.patch git-magic-fixup-2.patch git-netdev-all.patch drivers-net-ns83820c-add-paramter-to-disable-auto.patch git-net.patch git-net-fixup.patch git-nfs-fixup.patch revert-allow-file-systems-to-manually-d_move-inside-of-rename.patch git-ocfs2.patch git-parisc-powerpc-fix.patch git-pcmcia-fixup.patch git-powerpc.patch tickle-nmi-watchdog-on-serial-output-fix.patch serial-fix-uart_bug_txen-test.patch pcie-check-and-return-bus_register-errors-fix.patch git-scsi-misc.patch git-scsi-misc-fixup.patch revert-scsi-improve-inquiry-printing.patch git-scsi-misc-nlmsg_multicast-fix.patch git-block-vs-git-sas.patch git-scsi-target-fixup.patch git-scsi-target-vs-git-block.patch revert-gregkh-usb-usbcore-remove-usb_suspend_root_hub.patch gregkh-usb-usb-storage-add-rio-karma-eject-support-fix.patch fix-gregkh-usb-usbcore-add-autosuspend-autoresume-infrastructure.patch git-watchdog.patch revert-x86_64-mm-i386-remove-lock-section.patch revert-x86_64-mm-detect-cfi.patch fix-x86_64-mm-i386-backtrace-ebp-fallback.patch fix-x86_64-mm-i386-pda-smp-processorid.patch fix-x86_64-mm-spinlock-cleanup.patch xfs-rename-uio_read.patch adix-tree-rcu-lockless-readside-update-tidy.patch mm-tracking-shared-dirty-pages-checks.patch mm-tracking-shared-dirty-pages-wimp.patch convert-i386-numa-kva-space-to-bootmem-tidy.patch reduce-max_nr_zones-make-display-of-highmem-counters-conditional-on-config_highmem-tidy.patch reduce-max_nr_zones-use-enum-to-define-zones-reformat-and-comment-cleanup.patch reduce-max_nr_zones-use-enum-to-define-zones-reformat-and-comment-fix.patch reduce-max_nr_zones-remove-display-of-counters-for-unconfigured-zones-s390-fix.patch out-of-memory-notifier-tidy.patch mm-swap-write-failure-fixup-fix.patch slab-optimize-kmalloc_node-the-same-way-as-kmalloc-fix.patch slab-fix-lockdep-warnings-fix-2.patch have-x86-use-add_active_range-and-free_area_init_nodes-fix.patch zone_reclaim-dynamic-slab-reclaim-tidy.patch vm-add-per-zone-writeout-counter.patch convert-s390-page-handling-macros-to-functions-fix.patch slab-fix-kmalloc_node-applying-memory-policies-if-nodeid-==-numa_node_id-fix.patch gfp_thisnode-for-the-slab-allocator-v2-fix.patch get-rid-of-zone_table-fix.patch acx1xx-wireless-driver.patch tiacx-pci-build-fix.patch tiacx-ia64-fix.patch tiacx-build-fix.patch binfmt_elf-consistently-use-loff_t.patch nommu-set-bdi-capabilities-for-dev-mem-and-dev-kmem-tidy.patch nommu-move-the-fallback-arch_vma_name-to-a-sensible-place-fix.patch convert-i386-summit-subarch-to-use-srat-info-for-apicid_to_node-calls-tidy.patch i386-adds-smp_call_function_single-fix.patch swsusp-write-timer.patch swsusp-write-speedup.patch swsusp-read-timer.patch swsusp-read-speedup.patch swsusp-read-speedup-fix.patch swsusp-read-speedup-cleanup.patch swsusp-read-speedup-cleanup-2.patch swsusp-read-speedup-fix-fix-2.patch deprecate-smbfs-in-favour-of-cifs.patch edac-new-opteron-athlon64-memory-controller-driver-tidy.patch inode_diet-replace-inodeugeneric_ip-with-inodei_private-gfs-fix.patch inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-vs-gfs2.patch x86-microcode-microcode-driver-cleanup-tidy.patch x86-microcode-add-sysfs-and-hotplug-support-fix.patch eisa-bus-modalias-attributes-support-1-fix-git-kbuild-fix.patch add-address_space_operationsbatch_write-fix.patch alloc_fdtable-cleanup.patch sysctl-allow-proc-sys-without-sys_sysctl-fix.patch add-probe_kernel_address.patch x86-use-probe_kernel_address-in-handle_bug.patch blockdevc-check-errors.patch let-warn_on-warn_on_once-return-the-condition-fix.patch let-warn_on-warn_on_once-return-the-condition-fix-2.patch omap-add-watchdog-driver-support-tweaks.patch move-valid_dma_direction-from-x86_64-to-generic-code-fix.patch single-bit-flip-detector-tidy.patch fix-unserialized-task-files-changing-fix.patch tty-make-termios_sem-a-mutex-fix.patch solaris-emulation-incorrect-tty-locking-fix.patch solaris-emulation-incorrect-tty-locking-fix-2.patch cpuset-top_cpuset-tracks-hotplug-changes-to-node_online_map-fix.patch remove-sound-oss-copying.patch maximum-latency-tracking-infrastructure-tidy.patch fs-nameic-replace-multiple-current-fs-by-shortcut-variable-tidy.patch call-mm-page-writebackcset_ratelimit-when-new-pages-tidy.patch sys-modules-patch-allow-full-length-section-names.patch expand_fdtable-remove-pointless-unlocklock.patch implement-a-general-integer-log2-facility-in-the-kernel-safety.patch alter-roundup_pow_of_two-so-that-it-can-make-use-of-ilog2-on-a-constant-fix.patch add-config_headers_check-option-to-automatically-run-make-headers_check-nobble.patch ntp-move-all-the-ntp-related-code-to-ntpc-fix.patch reiserfs-on-demand-bitmap-loading.patch streamline-generic_file_-interfaces-and-filemap-gfs-fix.patch add-vector-aio-support-fix.patch csa-basic-accounting-over-taskstats-fix.patch fs-cache-make-kafs-use-fs-cache-fix.patch fs-cache-make-kafs-use-fs-cache-vs-streamline-generic_file_-interfaces-and-filemap.patch nfs-use-local-caching-12-fix.patch stack-overflow-safe-kdump-crash_use_safe_smp_processor_id-fix.patch generic-ioremap_page_range-x86_64-conversion-fix.patch vfs-make-filldir_t-and-struct-kstat-deal-in-64-bit-inode-numbers-alpha-fix.patch some-cleanup-in-the-pipe-code-tidy.patch support-piping-into-commands-in-proc-sys-kernel-core_pattern-fix.patch move-pidmap-to-pspaceh-fix.patch kprobes-handle-symbol-resolution-when-modulesymbol-is-specified-tidy.patch isdn-work-around-excessive-udelay.patch knfsd-add-a-callback-for-when-last-rpc-thread-finishes-tidy.patch knfsd-add-a-callback-for-when-last-rpc-thread-finishes-fix.patch knfsd-separate-out-some-parts-of-nfsd_svc-which-start-nfs-servers-tweaks.patch knfsd-define-new-nfsdfs-file-portlist-contains-list-of-ports-tidy.patch knfsd-define-new-nfsdfs-file-portlist-contains-list-of-ports-fix.patch knfsd-drop-serv-option-to-svc_recv-and-svc_process-nfs-callback-fix-nfs-callback-fix.patch knfsd-move-tempsock-aging-to-a-timer-tidy.patch sched-remove-unnecessary-sched-group-allocations-fix.patch swap_prefetch-vs-zoned-counters.patch ecryptfs-mmap-operations.patch ecryptfs-alpha-build-fix.patch ecryptfs-more-elegant-aes-key-size-manipulation.patch ecryptfs-get_sb_dev-fix.patch make-kmem_cache_destroy-return-void-ecryptfs.patch ecryptfs-versioning-fixes-tidy.patch namespaces-add-nsproxy.patch namespaces-utsname-switch-to-using-uts-namespaces.patch namespaces-utsname-switch-to-using-uts-namespaces-klibc-bit-sparc.patch namespaces-utsname-use-init_utsname-when-appropriate.patch namespaces-utsname-implement-utsname-namespaces.patch namespaces-utsname-sysctl-hack.patch ipc-namespace-core.patch rename-the-provided-execve-functions-to-kernel_execve-headers-fix.patch readahead-sysctl-parameters-fix.patch make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch make-kmem_cache_destroy-return-void-reiser4.patch reiser4-hardirq-include-fix.patch reiser4-run-truncate_inode_pages-in-reiser4_delete_inode.patch reiser4-get_sb_dev-fix.patch reiser4-vs-zoned-allocator.patch reiser4-rename-generic_sounding_globalspatch-fix.patch hpt3xx-rework-rate-filtering-tidy.patch genirq-convert-the-i386-architecture-to-irq-chips.patch genirq-x86_64-irq-reenable-migrating-irqs-to-other-cpus.patch genirq-msi-simplify-msi-enable-and-disable.patch genirq-ia64-irq-dynamic-irq-support.patch genirq-msi-only-build-msi-apicc-on-ia64-fix.patch genirq-i386-irq-remove-the-msi-assumption-that-irq-==-vector.patch genirq-x86_64-irq-make-vector_irq-per-cpu-fix.patch genirq-x86_64-irq-make-vector_irq-per-cpu-warning-fix.patch add-hypertransport-capability-defines-fix.patch initial-generic-hypertransport-interrupt-support-Kconfig-fix.patch srcu-report-out-of-memory-errors-fixlet.patch isdn-debug-build-fix.patch isdn-more-pr_debug-fixes.patch nr_blockdev_pages-in_interrupt-warning.patch device-suspend-debug.patch slab-leaks3-default-y.patch x86-kmap_atomic-debugging.patch restore-rogue-readahead-printk.patch put_bh-debug.patch acpi_format_exception-debug.patch jmicron-warning-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