Module Name: src
Committed By: pgoyette
Date: Sun Mar 25 08:49:12 UTC 2018
Modified Files:
src/sys/arch/x86/x86 [pgoyette-compat]: cpu_ucode_amd.c
cpu_ucode_intel.c
Log Message:
Don't try to #include opt_*.h files when building kernel modules
To generate a diff of this commit:
cvs rdiff -u -r1.7.28.2 -r1.7.28.3 src/sys/arch/x86/x86/cpu_ucode_amd.c
cvs rdiff -u -r1.12.8.2 -r1.12.8.3 src/sys/arch/x86/x86/cpu_ucode_intel.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/arch/x86/x86/cpu_ucode_amd.c
diff -u src/sys/arch/x86/x86/cpu_ucode_amd.c:1.7.28.2 src/sys/arch/x86/x86/cpu_ucode_amd.c:1.7.28.3
--- src/sys/arch/x86/x86/cpu_ucode_amd.c:1.7.28.2 Thu Mar 22 01:44:47 2018
+++ src/sys/arch/x86/x86/cpu_ucode_amd.c Sun Mar 25 08:49:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_ucode_amd.c,v 1.7.28.2 2018/03/22 01:44:47 pgoyette Exp $ */
+/* $NetBSD: cpu_ucode_amd.c,v 1.7.28.3 2018/03/25 08:49:12 pgoyette Exp $ */
/*
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,10 +29,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_ucode_amd.c,v 1.7.28.2 2018/03/22 01:44:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_ucode_amd.c,v 1.7.28.3 2018/03/25 08:49:12 pgoyette Exp $");
+#ifdef _KERNEL_OPT
#include "opt_xen.h"
#include "opt_cpu_ucode.h"
+#endif
#include <sys/param.h>
#include <sys/conf.h>
Index: src/sys/arch/x86/x86/cpu_ucode_intel.c
diff -u src/sys/arch/x86/x86/cpu_ucode_intel.c:1.12.8.2 src/sys/arch/x86/x86/cpu_ucode_intel.c:1.12.8.3
--- src/sys/arch/x86/x86/cpu_ucode_intel.c:1.12.8.2 Thu Mar 22 01:44:47 2018
+++ src/sys/arch/x86/x86/cpu_ucode_intel.c Sun Mar 25 08:49:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_ucode_intel.c,v 1.12.8.2 2018/03/22 01:44:47 pgoyette Exp $ */
+/* $NetBSD: cpu_ucode_intel.c,v 1.12.8.3 2018/03/25 08:49:12 pgoyette Exp $ */
/*
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,10 +29,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_ucode_intel.c,v 1.12.8.2 2018/03/22 01:44:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_ucode_intel.c,v 1.12.8.3 2018/03/25 08:49:12 pgoyette Exp $");
+#ifdef _KERNEL_OPT
#include "opt_xen.h"
#include "opt_cpu_ucode.h"
+#endif
#include <sys/param.h>
#include <sys/conf.h>
