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

[Ed Maste]

Author: emaste
Date: Tue Jan 20 22:34:38 2009
New Revision: 187496
URL: http://svn.freebsd.org/changeset/base/187496

Log:
  MFC r181693:
  
    Fix REDZONE(9) on amd64 and perhaps other 64 bit targets -- ensure the
    space that redzone adds to the allocation for storing its metadata is at
    least as large as the metadata that it will store there.
  
  PR:     kern/128744

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

Modified: stable/7/sys/vm/redzone.c
==============================================================================
--- stable/7/sys/vm/redzone.c	Tue Jan 20 22:26:09 2009	(r187495)
+++ stable/7/sys/vm/redzone.c	Tue Jan 20 22:34:38 2009	(r187496)
@@ -54,6 +54,8 @@ static u_long
 redzone_roundup(u_long n)
 {
 
+	if (n < REDZONE_HSIZE)
+		n = REDZONE_HSIZE;
 	if (n <= 128)
 		return (128);
 	else if (n <= 256)