summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2013-06-03 15:54:49 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2013-06-03 15:54:49 +0000
commit378984635a1cc64b5abdeaf657989badae279f5e (patch)
treed0909e4771ff59c57ec90aa418aa88b6e87c6132 /sys/arch
parent62a9ebcc8468d105a2771647e78946f73596ac9c (diff)
changes for isc fuse support. not enabled. ok beck deraadt.
from Sylvestre Gallon ccna.syl gmail.com
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/alpha/alpha/conf.c4
-rw-r--r--sys/arch/amd64/amd64/conf.c4
-rw-r--r--sys/arch/hp300/hp300/conf.c4
-rw-r--r--sys/arch/hppa/hppa/conf.c4
-rw-r--r--sys/arch/hppa64/hppa64/conf.c4
-rw-r--r--sys/arch/i386/i386/conf.c4
-rw-r--r--sys/arch/landisk/landisk/conf.c4
-rw-r--r--sys/arch/loongson/loongson/conf.c4
-rw-r--r--sys/arch/sgi/sgi/conf.c4
-rw-r--r--sys/arch/socppc/socppc/conf.c4
-rw-r--r--sys/arch/sparc/sparc/conf.c5
-rw-r--r--sys/arch/sparc64/sparc64/conf.c6
-rw-r--r--sys/arch/vax/vax/conf.c4
13 files changed, 40 insertions, 15 deletions
diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index f98728018b6..901d53c3247 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.70 2013/03/15 09:10:52 ratchov Exp $ */
+/* $OpenBSD: conf.c,v 1.71 2013/06/03 15:54:47 tedu Exp $ */
/* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */
/*-
@@ -130,6 +130,7 @@ cdev_decl(pci);
#include "hotplug.h"
#include "vscsi.h"
#include "pppx.h"
+#include "fuse.h"
struct cdevsw cdevsw[] =
{
@@ -204,6 +205,7 @@ struct cdevsw cdevsw[] =
cdev_pppx_init(NPPPX,pppx), /* 64: pppx */
cdev_urio_init(NURIO,urio), /* 65: USB Diamond Rio 500 */
cdev_usbdev_init(NUSCANNER,uscanner), /* 66: USB scanners */
+ cdev_fuse_init(NFUSE,fuse), /* 67: fuse */
};
int nchrdev = nitems(cdevsw);
diff --git a/sys/arch/amd64/amd64/conf.c b/sys/arch/amd64/amd64/conf.c
index 0dd539bac1a..6f40caab4ed 100644
--- a/sys/arch/amd64/amd64/conf.c
+++ b/sys/arch/amd64/amd64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.40 2013/03/15 09:10:52 ratchov Exp $ */
+/* $OpenBSD: conf.c,v 1.41 2013/06/03 15:54:47 tedu Exp $ */
/*
* Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved.
@@ -179,6 +179,7 @@ cdev_decl(pci);
#include "gpio.h"
#include "vscsi.h"
#include "pppx.h"
+#include "fuse.h"
struct cdevsw cdevsw[] =
{
@@ -286,6 +287,7 @@ struct cdevsw cdevsw[] =
cdev_vscsi_init(NVSCSI,vscsi), /* 89: vscsi */
cdev_disk_init(1,diskmap), /* 90: disk mapper */
cdev_pppx_init(NPPPX,pppx), /* 91: pppx */
+ cdev_fuse_init(NFUSE,fuse), /* 92: fuse */
};
int nchrdev = nitems(cdevsw);
diff --git a/sys/arch/hp300/hp300/conf.c b/sys/arch/hp300/hp300/conf.c
index 0b4a3fcc8c3..70ead37cdd7 100644
--- a/sys/arch/hp300/hp300/conf.c
+++ b/sys/arch/hp300/hp300/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.54 2012/08/23 06:12:49 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.55 2013/06/03 15:54:47 tedu Exp $ */
/* $NetBSD: conf.c,v 1.39 1997/05/12 08:17:53 thorpej Exp $ */
/*-
@@ -111,6 +111,7 @@ cdev_decl(fd);
#include "vscsi.h"
#include "pppx.h"
#include "hotplug.h"
+#include "fuse.h"
struct cdevsw cdevsw[] =
{
@@ -171,6 +172,7 @@ struct cdevsw cdevsw[] =
cdev_disk_init(1,diskmap), /* 54: disk mapper */
cdev_pppx_init(NPPPX,pppx), /* 55: pppx */
cdev_hotplug_init(NHOTPLUG,hotplug), /* 56: devices hot plugging */
+ cdev_fuse_init(NFUSE,fuse), /* 57: fuse */
};
int nchrdev = nitems(cdevsw);
diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c
index cb87d8bd285..d7f0c519236 100644
--- a/sys/arch/hppa/hppa/conf.c
+++ b/sys/arch/hppa/hppa/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.55 2012/08/23 06:12:49 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.56 2013/06/03 15:54:47 tedu Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -120,6 +120,7 @@ cdev_decl(pci);
#include "uscanner.h"
#include "bthub.h"
+#include "fuse.h"
struct cdevsw cdevsw[] =
{
@@ -186,6 +187,7 @@ struct cdevsw cdevsw[] =
cdev_bthub_init(NBTHUB,bthub), /* 55: bthub */
cdev_disk_init(1,diskmap), /* 56: disk mapper */
cdev_pppx_init(NPPPX,pppx), /* 57: pppx */
+ cdev_fuse_init(NFUSE,fuse), /* 58: fuse */
};
int nchrdev = nitems(cdevsw);
diff --git a/sys/arch/hppa64/hppa64/conf.c b/sys/arch/hppa64/hppa64/conf.c
index db70537e478..86a017168b2 100644
--- a/sys/arch/hppa64/hppa64/conf.c
+++ b/sys/arch/hppa64/hppa64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.22 2012/08/23 06:12:49 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.23 2013/06/03 15:54:47 tedu Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -120,6 +120,7 @@ cdev_decl(pci);
#include "uscanner.h"
#include "bthub.h"
+#include "fuse.h"
struct cdevsw cdevsw[] =
{
@@ -186,6 +187,7 @@ struct cdevsw cdevsw[] =
cdev_bthub_init(NBTHUB,bthub), /* 55: bthub */
cdev_disk_init(1,diskmap), /* 56: disk mapper */
cdev_pppx_init(NPPPX,pppx), /* 57: pppx */
+ cdev_fuse_init(NFUSE,fuse), /* 58: fuse */
};
int nchrdev = nitems(cdevsw);
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index c8b3d77fd2e..a1a55c8d6c0 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.142 2013/03/15 09:10:52 ratchov Exp $ */
+/* $OpenBSD: conf.c,v 1.143 2013/06/03 15:54:47 tedu Exp $ */
/* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */
/*
@@ -183,6 +183,7 @@ cdev_decl(pci);
#include "amdmsr.h"
#include "vscsi.h"
#include "pppx.h"
+#include "fuse.h"
struct cdevsw cdevsw[] =
{
@@ -291,6 +292,7 @@ struct cdevsw cdevsw[] =
cdev_vscsi_init(NVSCSI,vscsi), /* 90: vscsi */
cdev_disk_init(1,diskmap), /* 91: disk mapper */
cdev_pppx_init(NPPPX,pppx), /* 92: pppx */
+ cdev_fuse_init(NFUSE,fuse), /* 93: fuse */
};
int nchrdev = nitems(cdevsw);
diff --git a/sys/arch/landisk/landisk/conf.c b/sys/arch/landisk/landisk/conf.c
index 8b698828706..ac8ecea7c0c 100644
--- a/sys/arch/landisk/landisk/conf.c
+++ b/sys/arch/landisk/landisk/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.24 2013/03/15 09:10:52 ratchov Exp $ */
+/* $OpenBSD: conf.c,v 1.25 2013/06/03 15:54:47 tedu Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -255,6 +255,7 @@ struct bdevsw bdevsw[] = {
#include "scif.h"
#include "vscsi.h"
#include "pppx.h"
+#include "fuse.h"
struct cdevsw cdevsw[] = {
cdev_cn_init(1,cn), /* 0: virtual console */
@@ -364,6 +365,7 @@ struct cdevsw cdevsw[] = {
cdev_bthub_init(NBTHUB,bthub), /* 100: bthub */
cdev_disk_init(1,diskmap), /* 101: disk mapper */
cdev_pppx_init(NPPPX,pppx), /* 102: pppx */
+ cdev_fuse_init(NFUSE,fuse), /* 103: fuse */
};
int nblkdev = nitems(bdevsw);
diff --git a/sys/arch/loongson/loongson/conf.c b/sys/arch/loongson/loongson/conf.c
index 31de297f743..f069653702a 100644
--- a/sys/arch/loongson/loongson/conf.c
+++ b/sys/arch/loongson/loongson/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.14 2012/08/23 06:12:49 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.15 2013/06/03 15:54:47 tedu Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -130,6 +130,7 @@ cdev_decl(pci);
#include "bthub.h"
#include "vscsi.h"
#include "pppx.h"
+#include "fuse.h"
struct cdevsw cdevsw[] =
{
@@ -210,6 +211,7 @@ struct cdevsw cdevsw[] =
cdev_disk_init(1,diskmap), /* 70: disk mapper */
cdev_pppx_init(NPPPX,pppx), /* 71: pppx */
cdev_usbdev_init(NUSCANNER,uscanner), /* 72: USB scanners */
+ cdev_fuse_init(NFUSE,fuse), /* 73: fuse */
};
int nchrdev = nitems(cdevsw);
diff --git a/sys/arch/sgi/sgi/conf.c b/sys/arch/sgi/sgi/conf.c
index 85638ecfb22..3e3073da2a7 100644
--- a/sys/arch/sgi/sgi/conf.c
+++ b/sys/arch/sgi/sgi/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.31 2012/08/23 06:12:49 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.32 2013/06/03 15:54:47 tedu Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -130,6 +130,7 @@ cdev_decl(pci);
#include "vscsi.h"
#include "pppx.h"
+#include "fuse.h"
struct cdevsw cdevsw[] =
{
@@ -210,6 +211,7 @@ struct cdevsw cdevsw[] =
cdev_pppx_init(NPPPX,pppx), /* 70: pppx */
cdev_notdef(), /* 71: */
cdev_usbdev_init(NUSCANNER,uscanner), /* 72: USB scanners */
+ cdev_fuse_init(NFUSE,fuse), /* 73: fuse */
};
int nchrdev = nitems(cdevsw);
diff --git a/sys/arch/socppc/socppc/conf.c b/sys/arch/socppc/socppc/conf.c
index e41cb60825a..1f6e6be6381 100644
--- a/sys/arch/socppc/socppc/conf.c
+++ b/sys/arch/socppc/socppc/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.16 2012/04/06 15:10:40 jsing Exp $ */
+/* $OpenBSD: conf.c,v 1.17 2013/06/03 15:54:47 tedu Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -119,6 +119,7 @@ cdev_decl(pci);
#include "vscsi.h"
#include "pppx.h"
#include "hotplug.h"
+#include "fuse.h"
struct cdevsw cdevsw[] = {
cdev_cn_init(1,cn), /* 0: virtual console */
@@ -212,6 +213,7 @@ struct cdevsw cdevsw[] = {
cdev_disk_init(1,diskmap), /* 82: disk mapper */
cdev_pppx_init(NPPPX,pppx), /* 83: pppx */
cdev_hotplug_init(NHOTPLUG,hotplug), /* 84: devices hot plugging */
+ cdev_fuse_init(NFUSE,fuse), /* 85: fuse */
};
int nchrdev = nitems(cdevsw);
diff --git a/sys/arch/sparc/sparc/conf.c b/sys/arch/sparc/sparc/conf.c
index 62856506ab7..6efed5269c6 100644
--- a/sys/arch/sparc/sparc/conf.c
+++ b/sys/arch/sparc/sparc/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.61 2012/08/23 06:12:49 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.62 2013/06/03 15:54:47 tedu Exp $ */
/* $NetBSD: conf.c,v 1.40 1996/04/11 19:20:03 thorpej Exp $ */
/*
@@ -124,6 +124,7 @@ int nblkdev = nitems(bdevsw);
#include "vscsi.h"
#include "pppx.h"
#include "hotplug.h"
+#include "fuse.h"
struct cdevsw cdevsw[] =
{
@@ -214,7 +215,7 @@ struct cdevsw cdevsw[] =
cdev_mouse_init(NWSKBD, wskbd), /* 79: keyboards */
cdev_mouse_init(NWSMOUSE, wsmouse), /* 80: mice */
cdev_mouse_init(NWSMUX, wsmux), /* 81: ws multiplexer */
- cdev_notdef(), /* 82 */
+ cdev_fuse_init(NFUSE, fuse), /* 82: fuse */
cdev_notdef(), /* 83 */
cdev_notdef(), /* 84 */
cdev_notdef(), /* 85 */
diff --git a/sys/arch/sparc64/sparc64/conf.c b/sys/arch/sparc64/sparc64/conf.c
index 0b1d6b57cf9..9f6e87e3be7 100644
--- a/sys/arch/sparc64/sparc64/conf.c
+++ b/sys/arch/sparc64/sparc64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.66 2012/12/08 20:38:10 kettenis Exp $ */
+/* $OpenBSD: conf.c,v 1.67 2013/06/03 15:54:47 tedu Exp $ */
/* $NetBSD: conf.c,v 1.17 2001/03/26 12:33:26 lukem Exp $ */
/*
@@ -117,6 +117,7 @@ cdev_decl(pci);
#include "hotplug.h"
#include "vscsi.h"
#include "pppx.h"
+#include "fuse.h"
struct bdevsw bdevsw[] =
{
@@ -289,7 +290,8 @@ struct cdevsw cdevsw[] =
cdev_disk_init(1,diskmap), /* 130: disk mapper */
cdev_pppx_init(NPPPX,pppx), /* 131: pppx */
cdev_gen_init(NVLDCP,vldcp), /* 132: vldcp */
- cdev_vdsp_init(NVDSP,vdsp) /* 133: vdsp */
+ cdev_vdsp_init(NVDSP,vdsp), /* 133: vdsp */
+ cdev_fuse_init(NFUSE,fuse), /* 134: fuse */
};
int nchrdev = nitems(cdevsw);
diff --git a/sys/arch/vax/vax/conf.c b/sys/arch/vax/vax/conf.c
index c672a3702bd..15fc7a40174 100644
--- a/sys/arch/vax/vax/conf.c
+++ b/sys/arch/vax/vax/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.68 2012/08/23 06:12:49 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.69 2013/06/03 15:54:47 tedu Exp $ */
/* $NetBSD: conf.c,v 1.44 1999/10/27 16:38:54 ragge Exp $ */
/*-
@@ -175,6 +175,7 @@ cdev_decl(dl);
#include "vscsi.h"
#include "pppx.h"
#include "audio.h"
+#include "fuse.h"
struct cdevsw cdevsw[] =
{
@@ -260,6 +261,7 @@ struct cdevsw cdevsw[] =
cdev_disk_init(1,diskmap), /* 79: disk mapper */
cdev_pppx_init(NPPPX,pppx), /* 80: pppx */
cdev_audio_init(NAUDIO,audio), /* 81: /dev/audio */
+ cdev_fuse_init(NFUSE,fuse), /* 82: fuse */
};
int nchrdev = nitems(cdevsw);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 19:42:39 +0000