Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/pgoyette-compat]: src/sys/kern Use two different compat stubs since they...



details:   https://anonhg.NetBSD.org/src/rev/a0fbf2c5488e
branches:  pgoyette-compat
changeset: 830468:a0fbf2c5488e
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Sat Mar 17 02:56:36 2018 +0000

description:
Use two different compat stubs since they have different prototypes.

diffstat:

 sys/kern/kern_cpu.c |  16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diffs (43 lines):

diff -r f116ae02a54a -r a0fbf2c5488e sys/kern/kern_cpu.c
--- a/sys/kern/kern_cpu.c       Sat Mar 17 00:58:01 2018 +0000
+++ b/sys/kern/kern_cpu.c       Sat Mar 17 02:56:36 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_cpu.c,v 1.71.16.4 2018/03/17 00:58:01 pgoyette Exp $      */
+/*     $NetBSD: kern_cpu.c,v 1.71.16.5 2018/03/17 02:56:36 pgoyette Exp $      */
 
 /*-
  * Copyright (c) 2007, 2008, 2009, 2010, 2012 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.71.16.4 2018/03/17 00:58:01 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.71.16.5 2018/03/17 02:56:36 pgoyette Exp $");
 
 #include "opt_cpu_ucode.h"
 #include "opt_compat_netbsd.h"
@@ -135,15 +135,21 @@
 /*
  * routine vectors for compat code
  */
-static int stub_compat_6_cpu_ucode(const struct compat6_cpu_ucode *ucode)
+static int stub_compat_6_cpu_ucode_get_version(struct compat6_cpu_ucode *ucode)
+{
+
+       return ENOTTY;
+}
+
+static int stub_compat_6_cpu_ucode_apply(const struct compat6_cpu_ucode *ucode)
 {
 
        return ENOTTY;
 }
 int (*vec_compat6_cpu_ucode_get_version)(struct compat6_cpu_ucode *) =
-    stub_compat_6_cpu_ucode;
+    stub_compat_6_cpu_ucode_get_version;
 int (*vec_compat6_cpu_ucode_apply)(const struct compat6_cpu_ucode *) =
-    stub_compat_6_cpu_ucode;
+    stub_compat_6_cpu_ucode_apply;
 #endif
 
 /*



Home | Main Index | Thread Index | Old Index