patch-2.4.19 linux-2.4.19/include/linux/devfs_fs_kernel.h

• Lines: 52
• Date: Fri Aug 2 17:39:45 2002
• Orig file: linux-2.4.18/include/linux/devfs_fs_kernel.h
• Orig date: Fri Dec 21 09:42:03 2001

diff -urN linux-2.4.18/include/linux/devfs_fs_kernel.h linux-2.4.19/include/linux/devfs_fs_kernel.h
@@ -3,7 +3,7 @@
 
 #include <linux/fs.h>
 #include <linux/config.h>
-#include <linux/locks.h>
+#include <linux/spinlock.h>
 #include <linux/kdev_t.h>
 #include <linux/types.h>
 
@@ -46,14 +46,6 @@
 
 typedef struct devfs_entry * devfs_handle_t;
 
-
-#ifdef CONFIG_BLK_DEV_INITRD
-#  define ROOT_DEVICE_NAME ((real_root_dev ==ROOT_DEV) ? root_device_name:NULL)
-#else
-#  define ROOT_DEVICE_NAME root_device_name
-#endif
-
-
 #ifdef CONFIG_DEVFS_FS
 
 struct unique_numspace
@@ -62,7 +54,7 @@
     unsigned char sem_initialised;
     unsigned int num_free;          /*  Num free in bits       */
     unsigned int length;            /*  Array length in bytes  */
-    __u32 *bits;
+    unsigned long *bits;
     struct semaphore semaphore;
 };
 
@@ -124,7 +116,6 @@
 					 int number);
 
 extern void mount_devfs_fs (void);
-extern void devfs_make_root (const char *name);
 
 #else  /*  CONFIG_DEVFS_FS  */
 
@@ -320,10 +311,6 @@
 {
     return;
 }
-static inline void devfs_make_root (const char *name)
-{
-    return;
-}
 #endif  /*  CONFIG_DEVFS_FS  */
 
 #endif  /*  _LINUX_DEVFS_FS_KERNEL_H  */