[Glibc-bsd-commits] r4703 - in trunk/kfreebsd-kernel-headers: debian debian/patches test

[Robert Millan]

Author: rmh
Date: 2013-07-09 19:13:45 +0000 (Tue, 09 Jul 2013)
New Revision: 4703

Added:
   trunk/kfreebsd-kernel-headers/test/assert_correct_bsize.c
Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/param_collision.diff
   trunk/kfreebsd-kernel-headers/test/Makefile
Log:
Bring back DEV_BSIZE, add an assert test to ensure it's consistent with DEV_BSHIFT.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2013-07-09 19:12:02 UTC (rev 4702)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2013-07-09 19:13:45 UTC (rev 4703)
@@ -1,3 +1,10 @@
+kfreebsd-kernel-headers (9.1-2) UNRELEASED; urgency=low
+
+  * Bring back DEV_BSIZE, add an assert test to ensure it's consistent
+    with DEV_BSHIFT.
+
+ -- Robert Millan <rmh at debian.org>  Tue, 09 Jul 2013 21:13:25 +0200
+
 kfreebsd-kernel-headers (9.1-1) experimental; urgency=low
 
   * New upstream release.

Modified: trunk/kfreebsd-kernel-headers/debian/patches/param_collision.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/param_collision.diff	2013-07-09 19:12:02 UTC (rev 4702)
+++ trunk/kfreebsd-kernel-headers/debian/patches/param_collision.diff	2013-07-09 19:13:45 UTC (rev 4703)
@@ -28,20 +28,15 @@
  #define	NOFILE		OPEN_MAX	/* max open files per process */
  #define	NOGROUP		65535		/* marker for empty group set member */
  #define MAXHOSTNAMELEN	256		/* max hostname size */
-@@ -133,10 +134,12 @@
- #include <sys/limits.h>
- #endif
- 
-+#if 0
+@@ -136,7 +137,6 @@
  #ifndef DEV_BSHIFT
  #define	DEV_BSHIFT	9		/* log2(DEV_BSIZE) */
  #endif
- #define	DEV_BSIZE	(1<<DEV_BSHIFT)
-+#endif
+-#define	DEV_BSIZE	(1<<DEV_BSHIFT)
  
  #ifndef BLKDEV_IOSIZE
  #define BLKDEV_IOSIZE  PAGE_SIZE	/* default block device I/O size */
-@@ -213,9 +216,11 @@
+@@ -213,9 +213,11 @@
  #define	PDROP	0x200	/* OR'd with pri to stop re-entry of interlock mutex */
  #define	PBDRY	0x400	/* for PCATCH stop is done on the user boundary */
  
@@ -53,7 +48,7 @@
  #define	NBPW	sizeof(int)	/* number of bytes per word (integer) */
  
  #define	CMASK	022		/* default file mask: S_IWGRP|S_IWOTH */
-@@ -261,6 +266,7 @@
+@@ -261,6 +263,7 @@
  #define	MAXPATHLEN	PATH_MAX
  #define MAXSYMLINKS	32
  
@@ -61,7 +56,7 @@
  /* Bit map related macros. */
  #define	setbit(a,i)	(((unsigned char *)(a))[(i)/NBBY] |= 1<<((i)%NBBY))
  #define	clrbit(a,i)	(((unsigned char *)(a))[(i)/NBBY] &= ~(1<<((i)%NBBY)))
-@@ -268,6 +274,7 @@
+@@ -268,6 +271,7 @@
  	(((const unsigned char *)(a))[(i)/NBBY] & (1<<((i)%NBBY)))
  #define	isclr(a,i)							\
  	((((const unsigned char *)(a))[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
@@ -69,7 +64,7 @@
  
  /* Macros for counting and rounding. */
  #ifndef howmany
-@@ -275,9 +282,13 @@
+@@ -275,9 +279,13 @@
  #endif
  #define	nitems(x)	(sizeof((x)) / sizeof((x)[0]))
  #define	rounddown(x, y)	(((x)/(y))*(y))

Modified: trunk/kfreebsd-kernel-headers/test/Makefile
===================================================================
--- trunk/kfreebsd-kernel-headers/test/Makefile	2013-07-09 19:12:02 UTC (rev 4702)
+++ trunk/kfreebsd-kernel-headers/test/Makefile	2013-07-09 19:13:45 UTC (rev 4703)
@@ -1,4 +1,5 @@
 TESTS = \
+	assert_correct_bsize.o \
 	termios_collision.o \
 	type_collision.o \
 	time_collision.o \

Added: trunk/kfreebsd-kernel-headers/test/assert_correct_bsize.c
===================================================================
--- trunk/kfreebsd-kernel-headers/test/assert_correct_bsize.c	                        (rev 0)
+++ trunk/kfreebsd-kernel-headers/test/assert_correct_bsize.c	2013-07-09 19:13:45 UTC (rev 4703)
@@ -0,0 +1,2 @@
+#include <sys/param.h>
+char __assert_correct_bsize[DEV_BSIZE == (1<<DEV_BSHIFT) ? 0 : -1];