Page MenuHomeFreeBSD

D34913.id104997.diff
No OneTemporary

D34913.id104997.diff

Index: sys/dev/null/null.c
===================================================================
--- sys/dev/null/null.c
+++ sys/dev/null/null.c
@@ -109,11 +109,6 @@
error = 0;
switch (cmd) {
-#ifdef COMPAT_FREEBSD11
- case DIOCSKERNELDUMP_FREEBSD11:
- gone_in(13, "FreeBSD 11.x ABI compat");
- /* FALLTHROUGH */
-#endif
#ifdef COMPAT_FREEBSD12
case DIOCSKERNELDUMP_FREEBSD12:
if (cmd == DIOCSKERNELDUMP_FREEBSD12)
Index: sys/geom/geom_dev.c
===================================================================
--- sys/geom/geom_dev.c
+++ sys/geom/geom_dev.c
@@ -570,23 +570,6 @@
if (error == 0 && *(u_int *)data == 0)
error = ENOENT;
break;
-#ifdef COMPAT_FREEBSD11
- case DIOCSKERNELDUMP_FREEBSD11:
- {
- struct diocskerneldump_arg kda;
-
- gone_in(13, "FreeBSD 11.x ABI compat");
-
- bzero(&kda, sizeof(kda));
- kda.kda_encryption = KERNELDUMP_ENC_NONE;
- kda.kda_index = (*(u_int *)data ? 0 : KDA_REMOVE_ALL);
- if (kda.kda_index == KDA_REMOVE_ALL)
- error = dumper_remove(devtoname(dev), &kda);
- else
- error = g_dev_setdumpdev(dev, &kda);
- break;
- }
-#endif
#ifdef COMPAT_FREEBSD12
case DIOCSKERNELDUMP_FREEBSD12:
{
Index: sys/netinet/netdump/netdump_client.c
===================================================================
--- sys/netinet/netdump/netdump_client.c
+++ sys/netinet/netdump/netdump_client.c
@@ -499,9 +499,6 @@
struct dumperinfo dumper;
uint8_t *encryptedkey;
int error;
-#ifdef COMPAT_FREEBSD11
- u_int u;
-#endif
#ifdef COMPAT_FREEBSD12
struct diocskerneldump_arg_freebsd12 *kda12;
struct netdump_conf_freebsd12 *conf12;
@@ -512,18 +509,6 @@
NETDUMP_WLOCK();
switch (cmd) {
-#ifdef COMPAT_FREEBSD11
- case DIOCSKERNELDUMP_FREEBSD11:
- gone_in(13, "11.x ABI compatibility");
- u = *(u_int *)addr;
- if (u != 0) {
- error = ENXIO;
- break;
- }
- if (netdump_enabled())
- netdump_unconfigure();
- break;
-#endif
#ifdef COMPAT_FREEBSD12
/*
* Used by dumpon(8) in 12.x for clearing previous
Index: sys/sys/disk.h
===================================================================
--- sys/sys/disk.h
+++ sys/sys/disk.h
@@ -58,12 +58,6 @@
* disk label formats. Don't use it unless you have to.
*/
-#define DIOCSKERNELDUMP_FREEBSD11 _IOW('d', 133, u_int)
- /*
- * Enable/Disable (the argument is boolean) the device for kernel
- * core dumps.
- */
-
#define DIOCGFLUSH _IO('d', 135) /* Flush write cache */
/*
* Flush write cache of the device.

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 22, 1:52 PM (19 h, 12 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31982944
Default Alt Text
D34913.id104997.diff (2 KB)

Event Timeline