From 4cc62415576e6b06d9c5fac78b0a5e5a186b4e55 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Sun, 21 Apr 2002 15:47:03 +0000
Subject: [PATCH] Don't attempt to decvlare M_DEVFS whern MALLOC_DECLARE is not
 defined. This fixes warnings that should be errors in fstat.

Reminded by:	alpha tinderbox

Fixed some style bugs (ones near BOF and EOF; there are many more).
---
 sys/fs/devfs/devfs.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/sys/fs/devfs/devfs.h b/sys/fs/devfs/devfs.h
index 598fbf01d81..137797f4c8d 100644
--- a/sys/fs/devfs/devfs.h
+++ b/sys/fs/devfs/devfs.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 2000
@@ -35,7 +35,7 @@
  */
 
 #ifndef _FS_DEVFS_DEVFS_H_
-#define _FS_DEVFS_DEVFS_H_
+#define	_FS_DEVFS_DEVFS_H_
 
 #ifdef _KERNEL	/* No userland stuff in here... */
 
@@ -60,7 +60,9 @@
  */
 #define DEVFSINOMOUNT	0x2000000
 
+#ifdef MALLOC_DECLARE
 MALLOC_DECLARE(M_DEVFS);
+#endif
 
 struct devfs_dirent {
 	int	de_inode;
@@ -113,4 +115,5 @@ void devfs_purge (struct devfs_dirent *dd);
 struct devfs_dirent *devfs_vmkdir (char *name, int namelen, struct devfs_dirent *dotdot);
 
 #endif /* _KERNEL */
-#endif /* _FS_DEVFS_DEVFS_H_ */
+
+#endif /* !_FS_DEVFS_DEVFS_H_ */