diff options
-rw-r--r-- | sys/arch/alpha/alpha/conf.c | 3 | ||||
-rw-r--r-- | sys/arch/amd64/amd64/conf.c | 3 | ||||
-rw-r--r-- | sys/arch/arm/arm/conf.c | 3 | ||||
-rw-r--r-- | sys/arch/aviion/aviion/conf.c | 3 | ||||
-rw-r--r-- | sys/arch/hp300/hp300/conf.c | 4 | ||||
-rw-r--r-- | sys/arch/hppa/hppa/conf.c | 3 | ||||
-rw-r--r-- | sys/arch/hppa64/hppa64/conf.c | 4 | ||||
-rw-r--r-- | sys/arch/i386/i386/conf.c | 3 | ||||
-rw-r--r-- | sys/arch/landisk/landisk/conf.c | 3 | ||||
-rw-r--r-- | sys/arch/loongson/loongson/conf.c | 3 | ||||
-rw-r--r-- | sys/arch/luna88k/luna88k/conf.c | 3 | ||||
-rw-r--r-- | sys/arch/mac68k/mac68k/conf.c | 3 | ||||
-rw-r--r-- | sys/arch/macppc/macppc/conf.c | 3 | ||||
-rw-r--r-- | sys/arch/mvme68k/mvme68k/conf.c | 3 | ||||
-rw-r--r-- | sys/arch/mvme88k/mvme88k/conf.c | 3 | ||||
-rw-r--r-- | sys/arch/mvmeppc/mvmeppc/conf.c | 3 | ||||
-rw-r--r-- | sys/arch/sgi/sgi/conf.c | 3 | ||||
-rw-r--r-- | sys/arch/socppc/socppc/conf.c | 3 | ||||
-rw-r--r-- | sys/arch/sparc/sparc/conf.c | 3 | ||||
-rw-r--r-- | sys/arch/sparc64/sparc64/conf.c | 3 | ||||
-rw-r--r-- | sys/arch/vax/vax/conf.c | 3 |
21 files changed, 42 insertions, 23 deletions
diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c index b415cde65f1..80e3193c1eb 100644 --- a/sys/arch/alpha/alpha/conf.c +++ b/sys/arch/alpha/alpha/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.61 2010/03/30 19:16:09 matthieu Exp $ */ +/* $OpenBSD: conf.c,v 1.62 2010/06/09 15:25:32 jsing Exp $ */ /* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */ /*- @@ -210,6 +210,7 @@ struct cdevsw cdevsw[] = cdev_mouse_init(NWSMUX, wsmux), /* 60: ws multiplexor */ cdev_vscsi_init(NVSCSI, vscsi), /* 61: vscsi */ cdev_bthub_init(NBTHUB, bthub), /* 62: bthub */ + cdev_disk_init(1,diskmap), /* 63: disk mapper */ }; int nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]); diff --git a/sys/arch/amd64/amd64/conf.c b/sys/arch/amd64/amd64/conf.c index 5736633175a..5cf71ed028a 100644 --- a/sys/arch/amd64/amd64/conf.c +++ b/sys/arch/amd64/amd64/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.27 2009/08/13 15:04:20 dlg Exp $ */ +/* $OpenBSD: conf.c,v 1.28 2010/06/09 15:25:32 jsing Exp $ */ /* * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. @@ -304,6 +304,7 @@ struct cdevsw cdevsw[] = cdev_drm_init(NDRM,drm), /* 87: drm */ cdev_gpio_init(NGPIO,gpio), /* 88: gpio */ cdev_vscsi_init(NVSCSI,vscsi), /* 89: vscsi */ + cdev_disk_init(1,diskmap), /* 90: disk mapper */ }; int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]); diff --git a/sys/arch/arm/arm/conf.c b/sys/arch/arm/arm/conf.c index 1a4dd1773b7..bbee6a071be 100644 --- a/sys/arch/arm/arm/conf.c +++ b/sys/arch/arm/arm/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.24 2010/03/30 19:16:09 matthieu Exp $ */ +/* $OpenBSD: conf.c,v 1.25 2010/06/09 15:25:32 jsing Exp $ */ /* $NetBSD: conf.c,v 1.10 2002/04/19 01:04:38 wiz Exp $ */ /* @@ -410,6 +410,7 @@ struct cdevsw cdevsw[] = { cdev_spkr_init(NSPKR,spkr), /* 99: PC speaker */ cdev_vscsi_init(NVSCSI,vscsi), /* 100: vscsi */ cdev_bthub_init(NBTHUB,bthub), /* 101: bthub */ + cdev_disk_init(1,diskmap), /* 102: disk mapper */ }; int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]); diff --git a/sys/arch/aviion/aviion/conf.c b/sys/arch/aviion/aviion/conf.c index dcd1b8c14ad..6b0896f36b6 100644 --- a/sys/arch/aviion/aviion/conf.c +++ b/sys/arch/aviion/aviion/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.9 2009/08/13 15:04:20 dlg Exp $ */ +/* $OpenBSD: conf.c,v 1.10 2010/06/09 15:25:32 jsing Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -149,6 +149,7 @@ struct cdevsw cdevsw[] = #endif cdev_ptm_init(NPTY,ptm), /* 52: pseudo-tty ptm device */ cdev_vscsi_init(NVSCSI,vscsi), /* 53: vscsi */ + cdev_disk_init(1,diskmap), /* 54: disk mapper */ }; int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]); diff --git a/sys/arch/hp300/hp300/conf.c b/sys/arch/hp300/hp300/conf.c index 1a4d001f2e6..0bc3dcc63f7 100644 --- a/sys/arch/hp300/hp300/conf.c +++ b/sys/arch/hp300/hp300/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.46 2009/08/13 15:04:20 dlg Exp $ */ +/* $OpenBSD: conf.c,v 1.47 2010/06/09 15:25:32 jsing Exp $ */ /* $NetBSD: conf.c,v 1.39 1997/05/12 08:17:53 thorpej Exp $ */ /*- @@ -175,7 +175,7 @@ struct cdevsw cdevsw[] = #endif cdev_ptm_init(NPTY,ptm), /* 52: pseudo-tty ptm device */ cdev_vscsi_init(NVSCSI,vscsi), /* 53: vscsi */ - + cdev_disk_init(1,diskmap), /* 54: disk mapper */ }; int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]); diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c index 9d5404bd81a..b4a367c019c 100644 --- a/sys/arch/hppa/hppa/conf.c +++ b/sys/arch/hppa/hppa/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.49 2010/03/30 19:16:09 matthieu Exp $ */ +/* $OpenBSD: conf.c,v 1.50 2010/06/09 15:25:32 jsing Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -193,6 +193,7 @@ struct cdevsw cdevsw[] = cdev_lkm_dummy(), /* 53: */ cdev_vscsi_init(NVSCSI,vscsi), /* 54: vscsi */ cdev_bthub_init(NBTHUB,bthub), /* 55: bthub */ + cdev_disk_init(1,diskmap), /* 56: disk mapper */ }; int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]); diff --git a/sys/arch/hppa64/hppa64/conf.c b/sys/arch/hppa64/hppa64/conf.c index 5dc71e0b995..a446d5c5af0 100644 --- a/sys/arch/hppa64/hppa64/conf.c +++ b/sys/arch/hppa64/hppa64/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.13 2009/08/13 15:04:20 dlg Exp $ */ +/* $OpenBSD: conf.c,v 1.14 2010/06/09 15:25:32 jsing Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -175,7 +175,7 @@ struct cdevsw cdevsw[] = cdev_lkm_dummy(), /* 44 */ cdev_lkm_dummy(), /* 45 */ cdev_vscsi_init(NVSCSI,vscsi), /* 46: vscsi */ - + cdev_disk_init(1,diskmap), /* 47: disk mapper */ }; int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]); diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c index 2cb1817a288..eb7f434fbba 100644 --- a/sys/arch/i386/i386/conf.c +++ b/sys/arch/i386/i386/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.132 2009/08/13 15:04:20 dlg Exp $ */ +/* $OpenBSD: conf.c,v 1.133 2010/06/09 15:25:32 jsing Exp $ */ /* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */ /* @@ -308,6 +308,7 @@ struct cdevsw cdevsw[] = cdev_drm_init(NDRM,drm), /* 88: drm */ cdev_amdmsr_init(NAMDMSR,amdmsr), /* 89: amdmsr */ cdev_vscsi_init(NVSCSI,vscsi), /* 90: vscsi */ + cdev_disk_init(1,diskmap), /* 91: disk mapper */ }; int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]); diff --git a/sys/arch/landisk/landisk/conf.c b/sys/arch/landisk/landisk/conf.c index cc7c2fcd9f6..e503a4cc71c 100644 --- a/sys/arch/landisk/landisk/conf.c +++ b/sys/arch/landisk/landisk/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.14 2010/03/30 19:16:09 matthieu Exp $ */ +/* $OpenBSD: conf.c,v 1.15 2010/06/09 15:25:32 jsing Exp $ */ /* * Copyright (c) 1994-1998 Mark Brinicombe. @@ -388,6 +388,7 @@ struct cdevsw cdevsw[] = { cdev_ptm_init(NPTY,ptm), /* 98: pseudo-tty ptm device */ cdev_vscsi_init(NVSCSI,vscsi), /* 99: vscsi */ cdev_bthub_init(NBTHUB,bthub), /* 100: bthub */ + cdev_disk_init(1,diskmap), /* 101: disk mapper */ }; int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]); diff --git a/sys/arch/loongson/loongson/conf.c b/sys/arch/loongson/loongson/conf.c index b4232e0d94b..33536966144 100644 --- a/sys/arch/loongson/loongson/conf.c +++ b/sys/arch/loongson/loongson/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.5 2010/06/08 20:51:05 todd Exp $ */ +/* $OpenBSD: conf.c,v 1.6 2010/06/09 15:25:32 jsing Exp $ */ /* * Copyright (c) 1992, 1993 @@ -221,6 +221,7 @@ struct cdevsw cdevsw[] = cdev_hotplug_init(NHOTPLUG,hotplug), /* 67: devices hotplugging */ cdev_bthub_init(NBTHUB,bthub), /* 68: bluetooth hub */ cdev_vscsi_init(NVSCSI,vscsi), /* 69: vscsi */ + cdev_disk_init(1,diskmap), /* 70: disk mapper */ }; int nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]); diff --git a/sys/arch/luna88k/luna88k/conf.c b/sys/arch/luna88k/luna88k/conf.c index e09b5c845a5..19ab1c8c90f 100644 --- a/sys/arch/luna88k/luna88k/conf.c +++ b/sys/arch/luna88k/luna88k/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.12 2009/08/13 15:04:20 dlg Exp $ */ +/* $OpenBSD: conf.c,v 1.13 2010/06/09 15:25:32 jsing Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -158,6 +158,7 @@ struct cdevsw cdevsw[] = #endif cdev_ptm_init(NPTY,ptm), /* 52: pseudo-tty ptm device */ cdev_vscsi_init(NVSCSI,vscsi), /* 53: vscsi */ + cdev_disk_init(1,diskmap), /* 54: disk mapper */ }; int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]); diff --git a/sys/arch/mac68k/mac68k/conf.c b/sys/arch/mac68k/mac68k/conf.c index 41759fb95a7..b7c238c2fe7 100644 --- a/sys/arch/mac68k/mac68k/conf.c +++ b/sys/arch/mac68k/mac68k/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.44 2009/08/13 15:04:20 dlg Exp $ */ +/* $OpenBSD: conf.c,v 1.45 2010/06/09 15:25:32 jsing Exp $ */ /* $NetBSD: conf.c,v 1.41 1997/02/11 07:35:49 scottr Exp $ */ /* @@ -168,6 +168,7 @@ struct cdevsw cdevsw[] = #endif cdev_ptm_init(NPTY,ptm), /* 52: pseudo-tty ptm device */ cdev_vscsi_init(NVSCSI,vscsi), /* 53: vscsi */ + cdev_disk_init(1,diskmap), /* 54: disk mapper */ }; int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]); diff --git a/sys/arch/macppc/macppc/conf.c b/sys/arch/macppc/macppc/conf.c index f8796d673e1..83d110835a6 100644 --- a/sys/arch/macppc/macppc/conf.c +++ b/sys/arch/macppc/macppc/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.40 2009/08/13 15:04:20 dlg Exp $ */ +/* $OpenBSD: conf.c,v 1.41 2010/06/09 15:25:33 jsing Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -241,6 +241,7 @@ struct cdevsw cdevsw[] = { cdev_bthub_init(NBTHUB,bthub), /* 81: bthub */ cdev_openprom_init(1,openprom), /* 82: /dev/openprom */ cdev_vscsi_init(NVSCSI,vscsi), /* 83: vscsi */ + cdev_disk_init(1,diskmap), /* 84: disk mapper */ }; int nchrdev = sizeof cdevsw / sizeof cdevsw[0]; diff --git a/sys/arch/mvme68k/mvme68k/conf.c b/sys/arch/mvme68k/mvme68k/conf.c index 6ed0b740e57..07db58f1d6a 100644 --- a/sys/arch/mvme68k/mvme68k/conf.c +++ b/sys/arch/mvme68k/mvme68k/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.47 2009/08/13 15:04:20 dlg Exp $ */ +/* $OpenBSD: conf.c,v 1.48 2010/06/09 15:25:33 jsing Exp $ */ /*- * Copyright (c) 1995 Theo de Raadt @@ -219,6 +219,7 @@ struct cdevsw cdevsw[] = #endif cdev_ptm_init(NPTY,ptm), /* 52: pseudo-tty ptm device */ cdev_vscsi_init(NVSCSI,vscsi), /* 53: vscsi */ + cdev_disk_init(1,diskmap), /* 54: disk mapper */ }; int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]); diff --git a/sys/arch/mvme88k/mvme88k/conf.c b/sys/arch/mvme88k/mvme88k/conf.c index e1bc68f24af..4a404035cc3 100644 --- a/sys/arch/mvme88k/mvme88k/conf.c +++ b/sys/arch/mvme88k/mvme88k/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.39 2009/08/13 15:04:20 dlg Exp $ */ +/* $OpenBSD: conf.c,v 1.40 2010/06/09 15:25:33 jsing Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -204,6 +204,7 @@ struct cdevsw cdevsw[] = #endif cdev_ptm_init(NPTY,ptm), /* 52: pseudo-tty ptm device */ cdev_vscsi_init(NVSCSI,vscsi), /* 53: vscsi */ + cdev_disk_init(1,diskmap), /* 54: disk mapper */ }; int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]); diff --git a/sys/arch/mvmeppc/mvmeppc/conf.c b/sys/arch/mvmeppc/mvmeppc/conf.c index 0c0aef05bf7..dea3b7df549 100644 --- a/sys/arch/mvmeppc/mvmeppc/conf.c +++ b/sys/arch/mvmeppc/mvmeppc/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.26 2009/08/13 15:04:20 dlg Exp $ */ +/* $OpenBSD: conf.c,v 1.27 2010/06/09 15:25:33 jsing Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -181,6 +181,7 @@ struct cdevsw cdevsw[] = { cdev_disk_init(NRAID,raid), /* 54: RAIDframe disk driver */ cdev_ptm_init(NPTY,ptm), /* 55: pseudo-tty ptm device */ cdev_vscsi_init(NVSCSI,vscsi), /* 56: vscsi */ + cdev_disk_init(1,diskmap), /* 57: disk mapper */ }; int nchrdev = sizeof cdevsw / sizeof cdevsw[0]; diff --git a/sys/arch/sgi/sgi/conf.c b/sys/arch/sgi/sgi/conf.c index 0c8433e6a2c..a18d31729a7 100644 --- a/sys/arch/sgi/sgi/conf.c +++ b/sys/arch/sgi/sgi/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.22 2009/08/13 15:04:20 dlg Exp $ */ +/* $OpenBSD: conf.c,v 1.23 2010/06/09 15:25:33 jsing Exp $ */ /* * Copyright (c) 1992, 1993 @@ -211,6 +211,7 @@ struct cdevsw cdevsw[] = cdev_tty_init(NUCOM,ucom), /* 66: USB tty */ cdev_hotplug_init(NHOTPLUG,hotplug), /* 67: devices hotplugging */ cdev_vscsi_init(NVSCSI,vscsi), /* 68: vscsi */ + cdev_disk_init(1,diskmap), /* 69: disk mapper */ }; int nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]); diff --git a/sys/arch/socppc/socppc/conf.c b/sys/arch/socppc/socppc/conf.c index 2ea6c23622e..11be6ebbcb5 100644 --- a/sys/arch/socppc/socppc/conf.c +++ b/sys/arch/socppc/socppc/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.9 2010/03/31 16:33:08 deraadt Exp $ */ +/* $OpenBSD: conf.c,v 1.10 2010/06/09 15:25:33 jsing Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -203,6 +203,7 @@ struct cdevsw cdevsw[] = { cdev_notdef(), /* 79 */ cdev_notdef(), /* 80 */ cdev_bthub_init(NBTHUB,bthub), /* 81: bluetooth hub */ + cdev_disk_init(1,diskmap), /* 82: disk mapper */ }; int nchrdev = sizeof cdevsw / sizeof cdevsw[0]; diff --git a/sys/arch/sparc/sparc/conf.c b/sys/arch/sparc/sparc/conf.c index 7835978a51e..d3cc30c9b47 100644 --- a/sys/arch/sparc/sparc/conf.c +++ b/sys/arch/sparc/sparc/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.50 2009/08/13 15:04:20 dlg Exp $ */ +/* $OpenBSD: conf.c,v 1.51 2010/06/09 15:25:33 jsing Exp $ */ /* $NetBSD: conf.c,v 1.40 1996/04/11 19:20:03 thorpej Exp $ */ /* @@ -268,6 +268,7 @@ struct cdevsw cdevsw[] = cdev_bio_init(NBIO,bio), /* 124: ioctl tunnel */ cdev_ptm_init(NPTY,ptm), /* 125: pseudo-tty ptm device */ cdev_vscsi_init(NVSCSI,vscsi), /* 128: vscsi */ + cdev_disk_init(1,diskmap), /* 129: disk mapper */ }; int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]); diff --git a/sys/arch/sparc64/sparc64/conf.c b/sys/arch/sparc64/sparc64/conf.c index 14d11a15563..833c710f9ea 100644 --- a/sys/arch/sparc64/sparc64/conf.c +++ b/sys/arch/sparc64/sparc64/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.54 2010/03/30 19:16:09 matthieu Exp $ */ +/* $OpenBSD: conf.c,v 1.55 2010/06/09 15:25:33 jsing Exp $ */ /* $NetBSD: conf.c,v 1.17 2001/03/26 12:33:26 lukem Exp $ */ /* @@ -294,6 +294,7 @@ struct cdevsw cdevsw[] = cdev_tty_init(NVCCTTY,vcctty), /* 127: virtual console concentrator */ cdev_vscsi_init(NVSCSI,vscsi), /* 128: vscsi */ cdev_bthub_init(NBTHUB,bthub), /* 129: bluetooth hub */ + cdev_disk_init(1,diskmap), /* 130: disk mapper */ }; int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]); diff --git a/sys/arch/vax/vax/conf.c b/sys/arch/vax/vax/conf.c index 06aa72d08ca..2a28f826f5e 100644 --- a/sys/arch/vax/vax/conf.c +++ b/sys/arch/vax/vax/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.58 2009/08/13 15:04:20 dlg Exp $ */ +/* $OpenBSD: conf.c,v 1.59 2010/06/09 15:25:33 jsing Exp $ */ /* $NetBSD: conf.c,v 1.44 1999/10/27 16:38:54 ragge Exp $ */ /*- @@ -440,6 +440,7 @@ struct cdevsw cdevsw[] = #endif cdev_ptm_init(NPTY,ptm), /* 75: pseudo-tty ptm device */ cdev_vscsi_init(NVSCSI,vscsi), /* 78: vscsi */ + cdev_disk_init(1,diskmap), /* 79: disk mapper */ }; int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]); |