From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: - netfilter-fix-xt_times-time_mts-use-of-do_div.patch removed from -mm tree Date: Mon, 21 Jul 2008 14:34:13 -0700 Message-ID: <200807212134.m6LLYDaZ025651@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:38773 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752946AbYGUVfL (ORCPT ); Mon, 21 Jul 2008 17:35:11 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: dhowells@redhat.com, jengelh@computergmbh.de, kaber@trash.net, mm-commits@vger.kernel.org The patch titled netfilter: fix xt_time's time_mt()'s use of do_div() has been removed from the -mm tree. Its filename was netfilter-fix-xt_times-time_mts-use-of-do_div.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: netfilter: fix xt_time's time_mt()'s use of do_div() From: David Howells Fix netfilter xt_time's time_mt()'s use of do_div() on an s64 by using div_s64() instead. This was introduced by patch ee4411a1b1e0b679c99686629b5eab5a072ce49f. Signed-off-by: David Howells Cc: Patrick McHardy Cc: Jan Engelhardt Signed-off-by: Andrew Morton --- net/netfilter/xt_time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN net/netfilter/xt_time.c~netfilter-fix-xt_times-time_mts-use-of-do_div net/netfilter/xt_time.c --- a/net/netfilter/xt_time.c~netfilter-fix-xt_times-time_mts-use-of-do_div +++ a/net/netfilter/xt_time.c @@ -173,7 +173,7 @@ time_mt(const struct sk_buff *skb, const __net_timestamp((struct sk_buff *)skb); stamp = ktime_to_ns(skb->tstamp); - do_div(stamp, NSEC_PER_SEC); + stamp = div_s64(stamp, NSEC_PER_SEC); if (info->flags & XT_TIME_LOCAL_TZ) /* Adjust for local timezone */ _ Patches currently in -mm which might be from dhowells@redhat.com are origin.patch linux-next.patch calgary-fix-a-comparison-warning-the-pci-calgary-64-driver.patch cifs-fix-range-check.patch sis-drm-fix-the-memory-allocator-if-the-sis-fb-is-built-as-a-module.patch sis-drm-fix-a-pointer-cast-warning.patch atm-fix-const-assignment-discard-warnings-in-the-atm-networking-driver.patch atm-fix-direct-casts-of-pointers-to-u32-in-the-interphase-driver.patch hysdn-remove-the-packed-attribute-from-poftimstamp_tag.patch sched-fix-inc_rt_tasks-to-not-declare-variable-rq-if-its-not-needed.patch git-unionfs.patch clocksource-fix-a-print-format-error-in-the-acpi-pm-clocksource-driver-and-check-range.patch pm-fix-try_to_freeze_taskss-use-of-do_div.patch mn10300-move-sg_dma_addresslen-to-asm-scatterlisth.patch inflate-refactor-inflate-malloc-code.patch inflate-refactor-inflate-malloc-code-checkpatch-fixes.patch pnpacpi-fix-pnpacpi_parse_irq_options-test-against-pnp_irq_nr.patch pnp-fix-the-fcpnp_driver-declaration-to-only-exist-if-config_pnp=y.patch include-asm-ptraceh-userspace-headers-cleanup.patch coredump-elf_fdpic_core_dump-use-core_state-dumper-list.patch ip2-fix-iielliscleanup-as-it-is-static-but-not-always-used.patch tsacct-fix-bacct_add_tsks-use-of-do_div.patch frv-use-the-common-ascii-hex-helpers.patch mn10300-use-the-common-ascii-hex-helpers.patch mutex-subsystem-synchro-test-module.patch