Module Name: src
Committed By: pgoyette
Date: Sat Mar 17 02:56:36 UTC 2018
Modified Files:
src/sys/kern [pgoyette-compat]: kern_cpu.c
Log Message:
Use two different compat stubs since they have different prototypes.
To generate a diff of this commit:
cvs rdiff -u -r1.71.16.4 -r1.71.16.5 src/sys/kern/kern_cpu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_cpu.c
diff -u src/sys/kern/kern_cpu.c:1.71.16.4 src/sys/kern/kern_cpu.c:1.71.16.5
--- src/sys/kern/kern_cpu.c:1.71.16.4 Sat Mar 17 00:58:01 2018
+++ src/sys/kern/kern_cpu.c Sat Mar 17 02:56:36 2018
@@ -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 @@ static char cpu_model[128];
/*
* 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
/*
