svn commit: r187385 - in stable/7/sys: . arm/arm contrib/pf dev/ath/ath_hal dev/cxgb

[Stanislav Sedov]

Author: stas
Date: Sun Jan 18 11:43:23 2009
New Revision: 187385
URL: http://svn.freebsd.org/changeset/base/187385

Log:
  - Merge r185494:
    Get rid of unused variable in KTR checks. This allows ktr(4) enabled
    ARM kernel to compile.
  
  PR:		rm/128897
  Submitted by:	Pankov Pavel <pankov_p at mail.ru>

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/arm/arm/busdma_machdep.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/arm/arm/busdma_machdep.c
==============================================================================
--- stable/7/sys/arm/arm/busdma_machdep.c	Sun Jan 18 11:38:35 2009	(r187384)
+++ stable/7/sys/arm/arm/busdma_machdep.c	Sun Jan 18 11:43:23 2009	(r187385)
@@ -671,9 +671,8 @@ _bus_dmamap_count_pages(bus_dma_tag_t dm
 	bus_addr_t paddr;
 
 	if ((map->pagesneeded == 0)) {
-		CTR4(KTR_BUSDMA, "lowaddr= %d Maxmem= %d, boundary= %d, "
-		    "alignment= %d", dmat->lowaddr, ptoa((vm_paddr_t)Maxmem),
-		    dmat->boundary, dmat->alignment);
+		CTR3(KTR_BUSDMA, "lowaddr= %d, boundary= %d, alignment= %d",
+		    dmat->lowaddr, dmat->boundary, dmat->alignment);
 		CTR2(KTR_BUSDMA, "map= %p, pagesneeded= %d",
 		    map, map->pagesneeded);
 		/*