The patch titled Subject: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: fix min() warning has been added to the -mm tree. Its filename is drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.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 *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: fix min() warning i386: In file included from include/asm-generic/bug.h:13:0, from ./arch/x86/include/asm/bug.h:35, from include/linux/bug.h:4, from include/linux/mmdebug.h:4, from include/linux/gfp.h:4, from include/linux/slab.h:14, from drivers/net/wireless/intel/iwlwifi/dvm/calib.c:63: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: In function 'iwlagn_gain_computation': include/linux/kernel.h:752:17: warning: comparison of distinct pointer types lacks a cast [enabled by default] (void) (&_min1 == &_min2); \ ^ drivers/net/wireless/intel/iwlwifi/dvm/calib.c:903:4: note: in expansion of macro 'min' min(abs(delta_g), ^ Cc: Johannes Berg <johannes.berg@xxxxxxxxx> Cc: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx> Cc: Intel Linux Wireless <linuxwifi@xxxxxxxxx> Cc: Kalle Valo <kvalo@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff -puN drivers/net/wireless/intel/iwlwifi/dvm/calib.c~drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning drivers/net/wireless/intel/iwlwifi/dvm/calib.c --- a/drivers/net/wireless/intel/iwlwifi/dvm/calib.c~drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning +++ a/drivers/net/wireless/intel/iwlwifi/dvm/calib.c @@ -900,8 +900,7 @@ static void iwlagn_gain_computation(stru /* bound gain by 2 bits value max, 3rd bit is sign */ data->delta_gain_code[i] = - min(abs(delta_g), - (long) CHAIN_NOISE_MAX_DELTA_GAIN_CODE); + min(abs(delta_g), CHAIN_NOISE_MAX_DELTA_GAIN_CODE); if (delta_g < 0) /* _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are arch-alpha-kernel-systblss-remove-debug-check.patch drivers-gpu-drm-i915-intel_spritec-fix-build.patch drivers-gpu-drm-i915-intel_tvc-fix-build.patch ocfs2-fix-slot-overwritten-if-storage-link-down-during-mount-checkpatch-fixes.patch ocfs2-fix-ip_unaligned_aio-deadlock-with-dio-work-queue-fix.patch include-linux-dcacheh-remove-semicolons-from-hash_len_declare.patch drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch mm.patch account-certain-kmem-allocations-to-memcg-checkpatch-fixes.patch include-define-__phys_to_pfn-as-phys_pfn-fix.patch mempolicy-convert-the-shared_policy-lock-to-a-rwlock-fix-2.patch mm-zonelist-enumerate-zonelists-array-index-checkpatch-fixes.patch mm-zonelist-enumerate-zonelists-array-index-fix.patch mm-get-rid-of-__alloc_pages_high_priority-checkpatch-fixes.patch fs-block_devc-bdev_write_page-use-blk_queue_enter-gfp_noio.patch arm64-mm-support-arch_mmap_rnd_bits-fix.patch ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit-fix-2.patch page-flags-define-pg_locked-behavior-on-compound-pages-fix.patch mm-rework-mapcount-accounting-to-enable-4k-mapping-of-thps-fix.patch mm-hwpoison-adjust-for-new-thp-refcounting-fix.patch mm-prepare-page_referenced-and-page_idle-to-new-thp-refcounting-checkpatch-fixes.patch thp-add-debugfs-handle-to-split-all-huge-pages-fix.patch mm-printk-introduce-new-format-string-for-flags-fix-2.patch mm-support-madvisemadv_free-fix-2-fix.patch arch-uapi-asm-mmanh-let-madv_free-have-same-value-for-all-architectures-fix.patch arch-uapi-asm-mmanh-let-madv_free-have-same-value-for-all-architectures-fix-fix-2.patch arch-uapi-asm-mmanh-let-madv_free-have-same-value-for-all-architectures-fix-fix-2-fix-3.patch mm-oom-rework-oom-detection-checkpatch-fixes.patch mm-use-watermak-checks-for-__gfp_repeat-high-order-allocations-checkpatch-fixes.patch sched-add-schedule_timeout_idle.patch mm-oom-introduce-oom-reaper-fix-fix.patch mm-oom-introduce-oom-reaper-fix-fix-2.patch mm-oom-introduce-oom-reaper-checkpatch-fixes.patch mm-oom-introduce-oom-reaper-fix-3.patch mm-oom-introduce-oom-reaper-fix-4-fix.patch mm-oom-introduce-oom-reaper-fix-5-fix.patch kernel-stop_machinec-remove-config_smp-dependencies.patch kernel-stop_machinec-remove-config_smp-dependencies-fix.patch lib-vsprintfc-expand-field_width-to-24-bits-fix.patch lib-test_printfc-test-dentry-printing-fix.patch printk-help-pr_debug-and-pr_devel-to-optimize-out-arguments-fix.patch printk-nmi-generic-solution-for-safe-printk-in-nmi-v4-fix-fix.patch printk-nmi-warn-when-some-message-has-been-lost-in-nmi-context-fix.patch ptrace-task_stopped_codeptrace-=-true-cant-see-task_stopped-task-fix.patch ptrace-use-fsuid-fsgid-effective-creds-for-fs-access-checks-fix.patch fs-coredump-prevent-core-path-components-fix.patch ubsan-run-time-undefined-behavior-sanity-checker-fix.patch ubsan-run-time-undefined-behavior-sanity-checker-fix-3.patch linux-next-rejects.patch fs-overlayfs-superc-needs-pagemaph.patch fs-adfs-adfsh-tidy-up-comments.patch net-drop-tcp_memcontrolc-fix.patch mm-memcontrol-reign-in-the-config-space-madness-fix.patch mm-memcontrol-reign-in-the-config-space-madness-fix-fix.patch do_shared_fault-check-that-mmap_sem-is-held.patch kernel-forkc-export-kernel_thread-to-modules.patch slab-leaks3-default-y.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