Page MenuHomeFreeBSD
Files F137612243

D35172.id105859.diff
No OneTemporary
Actions

D35172.id105859.diff
View Options

Index: sys/kern/kern_conf.c
===================================================================
--- sys/kern/kern_conf.c
+++ sys/kern/kern_conf.c
@@ -301,7 +301,6 @@
biofinish(bp, NULL, ENXIO);
}
-#define dead_dump (dumper_t *)enxio
#define dead_kqfilter (d_kqfilter_t *)enxio
#define dead_mmap_single (d_mmap_single_t *)enodev
@@ -316,7 +315,6 @@
.d_mmap = dead_mmap,
.d_strategy = dead_strategy,
.d_name = "dead",
- .d_dump = dead_dump,
.d_kqfilter = dead_kqfilter,
.d_mmap_single = dead_mmap_single
};
@@ -346,8 +344,6 @@
return (poll_no_poll(events));
}
-#define no_dump (dumper_t *)enodev
-
static int
giant_open(struct cdev *dev, int oflags, int devtype, struct thread *td)
{
@@ -662,7 +658,6 @@
devsw->d_mmap = dead_mmap;
devsw->d_mmap_single = dead_mmap_single;
devsw->d_strategy = dead_strategy;
- devsw->d_dump = dead_dump;
devsw->d_kqfilter = dead_kqfilter;
}
@@ -701,8 +696,6 @@
FIXUP(d_kqfilter, no_kqfilter, giant_kqfilter);
FIXUP(d_mmap_single, no_mmap_single, giant_mmap_single);
- if (devsw->d_dump == NULL) devsw->d_dump = no_dump;
-
LIST_INIT(&devsw->d_devs);
devsw->d_flags |= D_INIT;
Index: sys/sys/conf.h
===================================================================
--- sys/sys/conf.h
+++ sys/sys/conf.h
@@ -209,17 +209,17 @@
d_poll_t *d_poll;
d_mmap_t *d_mmap;
d_strategy_t *d_strategy;
- dumper_t *d_dump;
+ void *d_spare0;
d_kqfilter_t *d_kqfilter;
d_purge_t *d_purge;
d_mmap_single_t *d_mmap_single;
- int32_t d_spare0[3];
- void *d_spare1[3];
+ int32_t d_spare1[3];
+ void *d_spare2[3];
/* These fields should not be messed with by drivers */
LIST_HEAD(, cdev) d_devs;
- int d_spare2;
+ int d_spare3;
union {
struct cdevsw *gianttrick;
SLIST_ENTRY(cdevsw) postfree_list;

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 25, 2:59 PM (6 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26142625
Default Alt Text
D35172.id105859.diff (1 KB)

Event Timeline