From owner-svn-src-all@FreeBSD.ORG Fri Aug 29 09:37:18 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E367F402; Fri, 29 Aug 2014 09:37:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B55F11FC7; Fri, 29 Aug 2014 09:37:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7T9bIPG043790; Fri, 29 Aug 2014 09:37:18 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7T9bIwp043789; Fri, 29 Aug 2014 09:37:18 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201408290937.s7T9bIwp043789@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Fri, 29 Aug 2014 09:37:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270799 - head/sys/dev/ixl X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Aug 2014 09:37:19 -0000 Author: bz Date: Fri Aug 29 09:37:18 2014 New Revision: 270799 URL: http://svnweb.freebsd.org/changeset/base/270799 Log: First try on fixing some more compile errors without actually testing: - use proper __FreeBSD_version check and more importantly check for __am64__ to be defined. Whether the FreeBSD(_version) checks are needed is a different question. - cast uint64_t to uintmax_t and use %jx for printing. Note: there are more values that could be printed in that status function but leave that for the future; printf doesn't seem to be the right way to do it anyway. Note: there is more breakage related to i40e_allocate_dma*() having conflicting declarations, so more fixes to come. PR: 193112 MFC after: 3 days X-MFC with: r270755 Modified: head/sys/dev/ixl/if_ixl.c Modified: head/sys/dev/ixl/if_ixl.c ============================================================================== --- head/sys/dev/ixl/if_ixl.c Fri Aug 29 09:29:10 2014 (r270798) +++ head/sys/dev/ixl/if_ixl.c Fri Aug 29 09:37:18 2014 (r270799) @@ -3983,11 +3983,11 @@ ixl_print_debug_info(struct ixl_pf *pf) u32 reg; - printf("Queue irqs = %lx\n", que->irqs); - printf("AdminQ irqs = %lx\n", pf->admin_irq); + printf("Queue irqs = %jx\n", (uintmax_t)que->irqs); + printf("AdminQ irqs = %jx\n", (uintmax_t)pf->admin_irq); printf("RX next check = %x\n", rxr->next_check); - printf("RX not ready = %lx\n", rxr->not_done); - printf("RX packets = %lx\n", rxr->rx_packets); + printf("RX not ready = %jx\n", (uintmax_t)rxr->not_done); + printf("RX packets = %jx\n", (uintmax_t)rxr->rx_packets); printf("TX desc avail = %x\n", txr->avail); reg = rd32(hw, I40E_GLV_GORCL(0xc)); @@ -4128,7 +4128,7 @@ ixl_stat_update48(struct i40e_hw *hw, u3 { u64 new_data; -#if __FreeBSD__ >= 10 && __amd64__ +#if defined(__FreeBSD__) && (__FreeBSD_version >= 1000000) && defined(__amd64__) new_data = rd64(hw, loreg); #else /*