summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/alpha/alpha/conf.c7
-rw-r--r--sys/arch/alpha/conf/GENERIC3
-rw-r--r--sys/arch/amd64/amd64/conf.c7
-rw-r--r--sys/arch/amd64/conf/GENERIC3
-rw-r--r--sys/arch/arm/arm/conf.c7
-rw-r--r--sys/arch/armish/conf/GENERIC4
-rw-r--r--sys/arch/armish/conf/RAMDISK3
-rw-r--r--sys/arch/i386/conf/GENERIC3
-rw-r--r--sys/arch/i386/i386/conf.c7
-rw-r--r--sys/arch/landisk/conf/RAMDISK4
-rw-r--r--sys/arch/landisk/landisk/conf.c7
-rw-r--r--sys/arch/macppc/macppc/conf.c7
-rw-r--r--sys/arch/socppc/socppc/conf.c9
-rw-r--r--sys/arch/sparc/sparc/conf.c7
-rw-r--r--sys/arch/sparc64/sparc64/conf.c7
-rw-r--r--sys/arch/vax/vax/conf.c8
-rw-r--r--sys/conf/files63
-rw-r--r--sys/sys/disklabel.h6
-rw-r--r--sys/sys/malloc.h8
19 files changed, 44 insertions, 126 deletions
diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index 35c539d719e..9bda6cfd77d 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.67 2011/10/06 20:49:27 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.68 2012/04/06 15:10:39 jsing Exp $ */
/* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */
/*-
@@ -51,7 +51,6 @@ bdev_decl(fd);
#include "sd.h"
#include "uk.h"
#include "vnd.h"
-#include "raid.h"
#include "rd.h"
#include "bktr.h"
#include "radio.h"
@@ -74,7 +73,7 @@ struct bdevsw bdevsw[] =
bdev_lkm_dummy(), /* 13 */
bdev_lkm_dummy(), /* 14 */
bdev_lkm_dummy(), /* 15 */
- bdev_disk_init(NRAID,raid), /* 16 */
+ bdev_notdef(), /* 16 was: RAIDframe disk driver */
};
int nblkdev = nitems(bdevsw);
@@ -183,7 +182,7 @@ struct cdevsw cdevsw[] =
cdev_spkr_init(NSPKR,spkr), /* 40: PC speaker */
cdev_midi_init(NMIDI,midi), /* 41: MIDI I/O */
cdev_midi_init(NSEQUENCER,sequencer), /* 42: sequencer I/O */
- cdev_disk_init(NRAID,raid), /* 43: RAIDframe disk driver */
+ cdev_notdef(), /* 43 was: RAIDframe disk driver */
cdev_video_init(NVIDEO,video), /* 44: generic video I/O */
cdev_usb_init(NUSB,usb), /* 45: USB controller */
cdev_usbdev_init(NUHID,uhid), /* 46: USB generic HID */
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index d9bc9e0fb70..b52d45e2fea 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.226 2011/10/10 12:34:23 jsg Exp $
+# $OpenBSD: GENERIC,v 1.227 2012/04/06 15:10:39 jsing Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -429,7 +429,6 @@ owsbm* at onewire? # Smart Battery Monitor
owtemp* at onewire? # Temperature
owctr* at onewire? # Counter device
-#pseudo-device raid 4 # RAIDframe disk driver
pseudo-device crypto 1
pseudo-device sequencer 1
pseudo-device hotplug 1 # devices hot plugging
diff --git a/sys/arch/amd64/amd64/conf.c b/sys/arch/amd64/amd64/conf.c
index bda6fd125fa..0f6a8c77b8e 100644
--- a/sys/arch/amd64/amd64/conf.c
+++ b/sys/arch/amd64/amd64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.36 2011/10/06 20:49:27 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.37 2012/04/06 15:10:39 jsing Exp $ */
/*
* Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved.
@@ -52,7 +52,6 @@ bdev_decl(fd);
#include "cd.h"
#include "uk.h"
#include "vnd.h"
-#include "raid.h"
#include "rd.h"
struct bdevsw bdevsw[] =
@@ -76,7 +75,7 @@ struct bdevsw bdevsw[] =
bdev_notdef(), /* 16: was: concatenated disk driver */
bdev_disk_init(NRD,rd), /* 17: ram disk driver */
bdev_lkm_dummy(), /* 18 */
- bdev_disk_init(NRAID,raid), /* 19: RAIDframe disk driver */
+ bdev_notdef(), /* 19 was: RAIDframe disk driver */
};
int nblkdev = nitems(bdevsw);
@@ -252,7 +251,7 @@ struct cdevsw cdevsw[] =
#endif
cdev_midi_init(NMIDI,midi), /* 52: MIDI I/O */
cdev_midi_init(NSEQUENCER,sequencer), /* 53: sequencer I/O */
- cdev_disk_init(NRAID,raid), /* 54: RAIDframe disk driver */
+ cdev_notdef(), /* 54 was: RAIDframe disk driver */
cdev_notdef(), /* 55: */
/* The following slots are reserved for isdn4bsd. */
cdev_notdef(), /* 56: i4b main device */
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index e5f8836642a..61661afef1f 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.326 2011/09/20 20:25:45 matthieu Exp $
+# $OpenBSD: GENERIC,v 1.327 2012/04/06 15:10:39 jsing Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -589,7 +589,6 @@ owctr* at onewire? # Counter device
pseudo-device pctr 1
pseudo-device nvram 1
pseudo-device sequencer 1
-#pseudo-device raid 4 # RAIDframe disk driver
pseudo-device hotplug 1 # devices hot plugging
pseudo-device mtrr 1 # Memory range attributes control
diff --git a/sys/arch/arm/arm/conf.c b/sys/arch/arm/arm/conf.c
index 4998ea731dc..38c35676836 100644
--- a/sys/arch/arm/arm/conf.c
+++ b/sys/arch/arm/arm/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.31 2011/10/06 20:49:27 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.32 2012/04/06 15:10:39 jsing Exp $ */
/* $NetBSD: conf.c,v 1.10 2002/04/19 01:04:38 wiz Exp $ */
/*
@@ -88,7 +88,6 @@
* Disk/Filesystem pseudo-devices
*/
#include "rd.h" /* memory disk driver */
-#include "raid.h" /* RAIDframe */
#include "vnd.h" /* vnode disk driver */
/*
@@ -230,7 +229,7 @@ struct bdevsw bdevsw[] = {
bdev_lkm_dummy(), /* 68: */
bdev_lkm_dummy(), /* 69: */
bdev_lkm_dummy(), /* 70: */
- bdev_disk_init(NRAID,raid), /* 71: RAIDframe disk driver */
+ bdev_notdef(), /* 71 was: RAIDframe disk driver */
bdev_lkm_dummy(), /* 72: */
bdev_lkm_dummy(), /* 73: */
bdev_lkm_dummy(), /* 74: */
@@ -362,7 +361,7 @@ struct cdevsw cdevsw[] = {
cdev_tty_init(NUCOM,ucom), /* 68: USB tty */
cdev_usbdev_init(NUSCANNER,uscanner), /* 69: USB scanner */
cdev_usbdev_init(NUGEN,ugen), /* 70: USB generic driver */
- cdev_disk_init(NRAID,raid), /* 71: RAIDframe disk driver */
+ cdev_notdef(), /* 71 was: RAIDframe disk driver */
cdev_lkm_dummy(), /* 72: reserved */
cdev_lkm_dummy(), /* 73: reserved */
cdev_lkm_dummy(), /* 74: reserved */
diff --git a/sys/arch/armish/conf/GENERIC b/sys/arch/armish/conf/GENERIC
index 8c5d1b6dd09..a9c60cd9863 100644
--- a/sys/arch/armish/conf/GENERIC
+++ b/sys/arch/armish/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.45 2012/01/31 18:12:28 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.46 2012/04/06 15:10:39 jsing Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -207,5 +207,3 @@ owctr* at onewire? # Counter device
pseudo-device wsmux 2
pseudo-device crypto 1
pseudo-device hotplug 1 # devices hot plugging
-#pseudo-device raid 4 # RAIDframe disk driver
-
diff --git a/sys/arch/armish/conf/RAMDISK b/sys/arch/armish/conf/RAMDISK
index 3f0b0c94caf..0435f19f015 100644
--- a/sys/arch/armish/conf/RAMDISK
+++ b/sys/arch/armish/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.23 2012/01/31 18:12:28 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.24 2012/04/06 15:10:39 jsing Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -175,7 +175,6 @@ pseudo-device wsmux 2
pseudo-device crypto 1
pseudo-device bio 1 # ioctl multiplexing device
pseudo-device hotplug 1 # devices hot plugging
-#pseudo-device raid 4 # RAIDframe disk driver
#
pseudo-device loop 1 # network loopback
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 7546dd084e3..e3d8ceff48f 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.732 2012/03/06 12:48:07 mikeb Exp $
+# $OpenBSD: GENERIC,v 1.733 2012/04/06 15:10:39 jsing Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -780,7 +780,6 @@ pseudo-device pctr 1
pseudo-device mtrr 1 # Memory range attributes control
pseudo-device nvram 1
pseudo-device sequencer 1
-#pseudo-device raid 4 # RAIDframe disk driver
pseudo-device hotplug 1 # devices hot plugging
# mouse & keyboard multiplexor pseudo-devices
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index 918ff59d360..27b26e486dd 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.139 2011/10/06 20:49:28 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.140 2012/04/06 15:10:39 jsing Exp $ */
/* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */
/*
@@ -53,7 +53,6 @@ bdev_decl(fd);
#include "cd.h"
#include "uk.h"
#include "vnd.h"
-#include "raid.h"
#include "rd.h"
struct bdevsw bdevsw[] =
@@ -77,7 +76,7 @@ struct bdevsw bdevsw[] =
bdev_notdef(), /* 16: was: concatenated disk driver */
bdev_disk_init(NRD,rd), /* 17: ram disk driver */
bdev_notdef(), /* 18 */
- bdev_disk_init(NRAID,raid), /* 19: RAIDframe disk driver */
+ bdev_notdef(), /* 19 was: RAIDframe disk driver */
};
int nblkdev = nitems(bdevsw);
@@ -256,7 +255,7 @@ struct cdevsw cdevsw[] =
#endif
cdev_midi_init(NMIDI,midi), /* 52: MIDI I/O */
cdev_midi_init(NSEQUENCER,sequencer), /* 53: sequencer I/O */
- cdev_disk_init(NRAID,raid), /* 54: RAIDframe disk driver */
+ cdev_notdef(), /* 54 was: RAIDframe disk driver */
cdev_notdef(), /* 55: */
/* The following slots are reserved for isdn4bsd. */
cdev_notdef(), /* 56: i4b main device */
diff --git a/sys/arch/landisk/conf/RAMDISK b/sys/arch/landisk/conf/RAMDISK
index 551e5bf1629..f661cdc6928 100644
--- a/sys/arch/landisk/conf/RAMDISK
+++ b/sys/arch/landisk/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.15 2011/06/29 20:52:09 matthew Exp $
+# $OpenBSD: RAMDISK,v 1.16 2012/04/06 15:10:40 jsing Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -123,8 +123,6 @@ pseudo-device wsmux 2
#pseudo-device crypto 1
#pseudo-device bio 1 # ioctl multiplexing device
#pseudo-device hotplug 1 # devices hot plugging
-#pseudo-device raid 4 # RAIDframe disk driver
-
option BOOT_CONFIG # boot-time kernel config
diff --git a/sys/arch/landisk/landisk/conf.c b/sys/arch/landisk/landisk/conf.c
index 8842f3bf04c..7da650156bc 100644
--- a/sys/arch/landisk/landisk/conf.c
+++ b/sys/arch/landisk/landisk/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.21 2011/10/06 20:49:28 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.22 2012/04/06 15:10:40 jsing Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -79,7 +79,6 @@
* Disk/Filesystem pseudo-devices
*/
#include "rd.h" /* memory disk driver */
-#include "raid.h" /* RAIDframe */
#include "vnd.h" /* vnode disk driver */
/*
@@ -217,7 +216,7 @@ struct bdevsw bdevsw[] = {
bdev_lkm_dummy(), /* 68: */
bdev_lkm_dummy(), /* 69: */
bdev_lkm_dummy(), /* 70: */
- bdev_disk_init(NRAID,raid), /* 71: RAIDframe disk driver */
+ bdev_notdef(), /* 71 was: RAIDframe disk driver */
bdev_lkm_dummy(), /* 72: */
bdev_lkm_dummy(), /* 73: */
bdev_lkm_dummy(), /* 74: */
@@ -338,7 +337,7 @@ struct cdevsw cdevsw[] = {
cdev_tty_init(NUCOM,ucom), /* 68: USB tty */
cdev_usbdev_init(NUSCANNER,uscanner), /* 69: USB scanner */
cdev_usbdev_init(NUGEN,ugen), /* 70: USB generic driver */
- cdev_disk_init(NRAID,raid), /* 71: RAIDframe disk driver */
+ cdev_notdef(), /* 71 was: RAIDframe disk driver */
cdev_lkm_dummy(), /* 72: reserved */
cdev_lkm_dummy(), /* 73: reserved */
cdev_lkm_dummy(), /* 74: reserved */
diff --git a/sys/arch/macppc/macppc/conf.c b/sys/arch/macppc/macppc/conf.c
index 0606b2d53cf..197d1a55d6f 100644
--- a/sys/arch/macppc/macppc/conf.c
+++ b/sys/arch/macppc/macppc/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.46 2011/10/06 20:49:28 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.47 2012/04/06 15:10:40 jsing Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -51,7 +51,6 @@ bdev_decl(wd);
cdev_decl(wd);
#include "vnd.h"
-#include "raid.h"
struct bdevsw bdevsw[] = {
bdev_disk_init(NWD,wd), /* 0: ST506/ESDI/IDE disk */
@@ -73,7 +72,7 @@ struct bdevsw bdevsw[] = {
bdev_notdef(), /* 16 was: concatenated disk driver*/
bdev_disk_init(NRD,rd), /* 17 ram disk driver*/
bdev_notdef(), /* 18 unknown*/
- bdev_disk_init(NRAID,raid), /* 19: RAIDframe disk driver */
+ bdev_notdef(), /* 19 was: RAIDframe disk driver */
};
int nblkdev = nitems(bdevsw);
@@ -204,7 +203,7 @@ struct cdevsw cdevsw[] = {
#endif
cdev_midi_init(NMIDI,midi), /* 52: MIDI I/O */
cdev_midi_init(NSEQUENCER,sequencer), /* 53: sequencer I/O */
- cdev_disk_init(NRAID,raid), /* 54: RAIDframe disk driver */
+ cdev_notdef(), /* 54 was: RAIDframe disk driver */
cdev_notdef(), /* 55 */
/* The following slots are reserved for isdn4bsd. */
cdev_notdef(), /* 56: i4b main device */
diff --git a/sys/arch/socppc/socppc/conf.c b/sys/arch/socppc/socppc/conf.c
index e760f64f29e..e41cb60825a 100644
--- a/sys/arch/socppc/socppc/conf.c
+++ b/sys/arch/socppc/socppc/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.15 2011/10/06 20:49:28 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.16 2012/04/06 15:10:40 jsing Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -48,7 +48,6 @@ bdev_decl(wd);
cdev_decl(wd);
#include "vnd.h"
-#include "raid.h"
#include "video.h"
struct bdevsw bdevsw[] = {
@@ -68,10 +67,10 @@ struct bdevsw bdevsw[] = {
bdev_lkm_dummy(), /* 13 */
bdev_disk_init(NVND,vnd), /* 14 vnode disk driver*/
bdev_notdef(), /* 15 unknown*/
- bdev_notdef(), /* 16: was: concatenated disk driver */
+ bdev_notdef(), /* 16 was: concatenated disk driver */
bdev_disk_init(NRD,rd), /* 17 ram disk driver*/
bdev_notdef(), /* 18 unknown*/
- bdev_disk_init(NRAID,raid), /* 19 RAIDframe disk driver */
+ bdev_notdef(), /* 19 was: RAIDframe disk driver */
};
int nblkdev = nitems(bdevsw);
@@ -176,7 +175,7 @@ struct cdevsw cdevsw[] = {
cdev_notdef(), /* 51 */
cdev_notdef(), /* 52 */
cdev_notdef(), /* 53 */
- cdev_disk_init(NRAID,raid), /* 54: RAIDframe disk driver */
+ cdev_notdef(), /* 54 was: RAIDframe disk driver */
cdev_notdef(), /* 55 */
cdev_notdef(), /* 56 */
cdev_notdef(), /* 57 */
diff --git a/sys/arch/sparc/sparc/conf.c b/sys/arch/sparc/sparc/conf.c
index 59af317c79e..873bcd33982 100644
--- a/sys/arch/sparc/sparc/conf.c
+++ b/sys/arch/sparc/sparc/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.59 2011/10/06 20:49:28 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.60 2012/04/06 15:10:40 jsing Exp $ */
/* $NetBSD: conf.c,v 1.40 1996/04/11 19:20:03 thorpej Exp $ */
/*
@@ -57,7 +57,6 @@
#include "tun.h"
#include "audio.h"
#include "vnd.h"
-#include "raid.h"
#include "ch.h"
#include "uk.h"
#include "sd.h"
@@ -118,7 +117,7 @@ struct bdevsw bdevsw[] =
bdev_lkm_dummy(), /* 22 */
bdev_lkm_dummy(), /* 23 */
bdev_lkm_dummy(), /* 24 */
- bdev_disk_init(NRAID,raid), /* 25: RAIDframe disk driver */
+ bdev_notdef(), /* 25 was: RAIDframe disk driver */
bdev_disk_init(NPRESTO,presto), /* 26: Prestoserve NVRAM */
};
int nblkdev = nitems(bdevsw);
@@ -264,7 +263,7 @@ struct cdevsw cdevsw[] =
cdev_uk_init(NUK,uk), /* 120: unknown SCSI */
cdev_notdef(), /* 121 */
cdev_ksyms_init(NKSYMS,ksyms), /* 122: Kernel symbols device */
- cdev_disk_init(NRAID,raid), /* 123: RAIDframe disk driver */
+ cdev_notdef(), /* 123 was: RAIDframe disk driver */
cdev_bio_init(NBIO,bio), /* 124: ioctl tunnel */
cdev_ptm_init(NPTY,ptm), /* 125: pseudo-tty ptm device */
cdev_notdef(), /* 126 */
diff --git a/sys/arch/sparc64/sparc64/conf.c b/sys/arch/sparc64/sparc64/conf.c
index 8dfbc739c4f..be58f382f37 100644
--- a/sys/arch/sparc64/sparc64/conf.c
+++ b/sys/arch/sparc64/sparc64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.62 2012/03/17 21:32:02 kettenis Exp $ */
+/* $OpenBSD: conf.c,v 1.63 2012/04/06 15:10:40 jsing Exp $ */
/* $NetBSD: conf.c,v 1.17 2001/03/26 12:33:26 lukem Exp $ */
/*
@@ -65,7 +65,6 @@
#include "cd.h"
#include "uk.h"
#include "wd.h"
-#include "raid.h"
#ifdef notyet
#include "fb.h"
@@ -150,7 +149,7 @@ struct bdevsw bdevsw[] =
bdev_lkm_dummy(), /* 22 */
bdev_lkm_dummy(), /* 23 */
bdev_lkm_dummy(), /* 24 */
- bdev_disk_init(NRAID,raid), /* 25: RAIDframe disk driver */
+ bdev_notdef(), /* 25 was: RAIDframe disk driver */
};
int nblkdev = nitems(bdevsw);
@@ -286,7 +285,7 @@ struct cdevsw cdevsw[] =
cdev_lkm_dummy(), /* 118 */
cdev_random_init(1,random), /* 119: random data source */
cdev_bio_init(NBIO,bio), /* 120: ioctl tunnel */
- cdev_disk_init(NRAID,raid), /* 121: RAIDframe disk driver */
+ cdev_notdef(), /* 121 was: RAIDframe disk driver */
cdev_tty_init(NPCONS,pcons), /* 122: PROM console */
cdev_ptm_init(NPTY,ptm), /* 123: pseudo-tty ptm device */
cdev_hotplug_init(NHOTPLUG,hotplug), /* 124: devices hot plugging */
diff --git a/sys/arch/vax/vax/conf.c b/sys/arch/vax/vax/conf.c
index 91fecf475d0..e1a1f55f95d 100644
--- a/sys/arch/vax/vax/conf.c
+++ b/sys/arch/vax/vax/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.66 2011/10/06 20:49:28 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.67 2012/04/06 15:10:40 jsing Exp $ */
/* $NetBSD: conf.c,v 1.44 1999/10/27 16:38:54 ragge Exp $ */
/*-
@@ -49,8 +49,6 @@ bdev_decl(mt);
bdev_decl(ra);
bdev_decl(rx);
-#include "raid.h"
-
#include "vnd.h"
#include "hdc.h"
@@ -90,7 +88,7 @@ struct bdevsw bdevsw[] =
bdev_disk_init(NCD,cd), /* 22: SCSI CD-ROM */
bdev_disk_init(NRD,rd), /* 23: ram disk driver */
bdev_disk_init(NRY,ry), /* 24: VS3100 floppy */
- bdev_disk_init(NRAID,raid), /* 25: RAIDframe disk driver */
+ bdev_notdef(), /* 25 was: RAIDframe disk driver */
};
int nblkdev = nitems(bdevsw);
@@ -258,7 +256,7 @@ struct cdevsw cdevsw[] =
cdev_mouse_init(NWSMOUSE, wsmouse), /* 70: mice */
cdev_disk_init(NRY,ry), /* 71: VS floppy */
cdev_bio_init(NBIO,bio), /* 72: ioctl tunnel */
- cdev_disk_init(NRAID,raid), /* 73: RAIDframe disk driver */
+ cdev_notdef(), /* 73 was: RAIDframe disk driver */
#ifdef NNPFS
cdev_nnpfs_init(NNNPFS,nnpfs_dev), /* 74: nnpfs communication device */
#else
diff --git a/sys/conf/files b/sys/conf/files
index dad448cd616..c9f64518be5 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-# $OpenBSD: files,v 1.535 2012/03/28 20:44:23 miod Exp $
+# $OpenBSD: files,v 1.536 2012/04/06 15:10:40 jsing Exp $
# $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@@ -503,7 +503,6 @@ file dev/spdmem.c spdmem
# legitimate pseudo-devices
pseudo-device vnd: disk
-pseudo-device raid: disk
pseudo-device rd: disk
file dev/rd.c rd needs-flag
@@ -614,66 +613,6 @@ file dev/sequencer.c sequencer needs-flag
file dev/systrace.c systrace needs-flag
file dev/vnd.c vnd needs-flag
file dev/rnd.c
-file dev/raidframe/rf_acctrace.c raid needs-flag
-file dev/raidframe/rf_alloclist.c raid needs-flag
-file dev/raidframe/rf_aselect.c raid needs-flag
-file dev/raidframe/rf_callback.c raid needs-flag
-file dev/raidframe/rf_chaindecluster.c raid needs-flag
-file dev/raidframe/rf_copyback.c raid needs-flag
-file dev/raidframe/rf_cvscan.c raid needs-flag
-file dev/raidframe/rf_dagdegrd.c raid needs-flag
-file dev/raidframe/rf_dagdegwr.c raid needs-flag
-file dev/raidframe/rf_dagffrd.c raid needs-flag
-file dev/raidframe/rf_dagffwr.c raid needs-flag
-file dev/raidframe/rf_dagfuncs.c raid needs-flag
-file dev/raidframe/rf_dagutils.c raid needs-flag
-file dev/raidframe/rf_debugMem.c raid needs-flag
-file dev/raidframe/rf_debugprint.c raid needs-flag
-file dev/raidframe/rf_decluster.c raid needs-flag
-file dev/raidframe/rf_declusterPQ.c raid needs-flag
-file dev/raidframe/rf_diskqueue.c raid needs-flag
-file dev/raidframe/rf_disks.c raid needs-flag
-file dev/raidframe/rf_driver.c raid needs-flag
-file dev/raidframe/rf_engine.c raid needs-flag
-file dev/raidframe/rf_evenodd.c raid needs-flag
-file dev/raidframe/rf_evenodd_dagfuncs.c raid needs-flag
-file dev/raidframe/rf_evenodd_dags.c raid needs-flag
-file dev/raidframe/rf_fifo.c raid needs-flag
-file dev/raidframe/rf_interdecluster.c raid needs-flag
-file dev/raidframe/rf_invertq.c raid needs-flag
-file dev/raidframe/rf_openbsdkintf.c raid needs-flag
-file dev/raidframe/rf_layout.c raid needs-flag
-file dev/raidframe/rf_map.c raid needs-flag
-file dev/raidframe/rf_mcpair.c raid needs-flag
-file dev/raidframe/rf_memchunk.c raid needs-flag
-file dev/raidframe/rf_nwayxor.c raid needs-flag
-file dev/raidframe/rf_options.c raid needs-flag
-file dev/raidframe/rf_paritylog.c raid needs-flag
-file dev/raidframe/rf_paritylogDiskMgr.c raid needs-flag
-file dev/raidframe/rf_paritylogging.c raid needs-flag
-file dev/raidframe/rf_parityloggingdags.c raid needs-flag
-file dev/raidframe/rf_parityscan.c raid needs-flag
-file dev/raidframe/rf_pq.c raid needs-flag
-file dev/raidframe/rf_pqdeg.c raid needs-flag
-file dev/raidframe/rf_pqdegdags.c raid needs-flag
-file dev/raidframe/rf_psstatus.c raid needs-flag
-file dev/raidframe/rf_raid0.c raid needs-flag
-file dev/raidframe/rf_raid1.c raid needs-flag
-file dev/raidframe/rf_raid4.c raid needs-flag
-file dev/raidframe/rf_raid5.c raid needs-flag
-file dev/raidframe/rf_raid5_rotatedspare.c raid needs-flag
-file dev/raidframe/rf_reconbuffer.c raid needs-flag
-file dev/raidframe/rf_reconmap.c raid needs-flag
-file dev/raidframe/rf_reconstruct.c raid needs-flag
-file dev/raidframe/rf_reconutil.c raid needs-flag
-file dev/raidframe/rf_revent.c raid needs-flag
-file dev/raidframe/rf_shutdown.c raid needs-flag
-file dev/raidframe/rf_sstf.c raid needs-flag
-file dev/raidframe/rf_states.c raid needs-flag
-file dev/raidframe/rf_stripelocks.c raid needs-flag
-file dev/raidframe/rf_strutils.c raid needs-flag
-file dev/raidframe/rf_threadstuff.c raid needs-flag
-file dev/raidframe/rf_utils.c raid needs-flag
file dev/video.c video needs-flag
file isofs/cd9660/cd9660_bmap.c cd9660
file isofs/cd9660/cd9660_lookup.c cd9660
diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h
index cffda57a106..97cffd4c817 100644
--- a/sys/sys/disklabel.h
+++ b/sys/sys/disklabel.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: disklabel.h,v 1.53 2011/10/06 21:16:01 deraadt Exp $ */
+/* $OpenBSD: disklabel.h,v 1.54 2012/04/06 15:10:40 jsing Exp $ */
/* $NetBSD: disklabel.h,v 1.41 1996/05/10 23:07:37 mark Exp $ */
/*
@@ -223,7 +223,7 @@ struct __partitionv0 { /* the partition table */
#define DTYPE_CCD 11 /* was: concatenated disk device */
#define DTYPE_VND 12 /* vnode pseudo-disk */
#define DTYPE_ATAPI 13 /* ATAPI */
-#define DTYPE_RAID 14 /* RAIDframe */
+#define DTYPE_RAID 14 /* was: RAIDframe */
#ifdef DKTYPENAMES
static char *dktypenames[] = {
@@ -271,7 +271,7 @@ static char *dktypenames[] = {
#define FS_ADFS 16 /* Acorn Disk Filing System */
#define FS_EXT2FS 17 /* ext2fs */
#define FS_CCD 18 /* ccd component */
-#define FS_RAID 19 /* RAIDframe */
+#define FS_RAID 19 /* RAIDframe or softraid */
#define FS_NTFS 20 /* Windows/NT file system */
#define FS_UDF 21 /* UDF (DVD) filesystem */
diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h
index 961e7354271..80e4c10c18c 100644
--- a/sys/sys/malloc.h
+++ b/sys/sys/malloc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: malloc.h,v 1.99 2010/12/25 00:13:21 tedu Exp $ */
+/* $OpenBSD: malloc.h,v 1.100 2012/04/06 15:10:40 jsing Exp $ */
/* $NetBSD: malloc.h,v 1.39 1998/07/12 19:52:01 augustss Exp $ */
/*
@@ -130,8 +130,7 @@
#define M_INDIRDEP 83 /* Indirect block dependencies */
/* 84-91 - free */
#define M_VMSWAP 92 /* VM swap structures */
-/* 93-96 - free */
-#define M_RAIDFRAME 97 /* RAIDframe data */
+/* 93-97 - free */
#define M_UVMAMAP 98 /* UVM amap and related */
#define M_UVMAOBJ 99 /* UVM aobj and related */
/* 100 - free */
@@ -271,8 +270,7 @@
NULL, NULL, NULL, NULL, \
NULL, NULL, NULL, NULL, \
"VM swap", /* 92 M_VMSWAP */ \
- NULL, NULL, NULL, NULL, \
- "RAIDframe data", /* 97 M_RAIDFRAME */ \
+ NULL, NULL, NULL, NULL, NULL, \
"UVM amap", /* 98 M_UVMAMAP */ \
"UVM aobj", /* 99 M_UVMAOBJ */ \
NULL, \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 09:18:59 +0000