Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:52:47 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/include/asm: cpufeature.h
src/sys/external/bsd/drm2/include/linux: cpufreq.h
Log Message:
linux: Use sys/cpu.h, not machine/cpu.h.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/include/asm/cpufeature.h
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/include/linux/cpufreq.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/include/asm/cpufeature.h
diff -u src/sys/external/bsd/drm2/include/asm/cpufeature.h:1.8 src/sys/external/bsd/drm2/include/asm/cpufeature.h:1.9
--- src/sys/external/bsd/drm2/include/asm/cpufeature.h:1.8 Sun Dec 19 11:33:49 2021
+++ src/sys/external/bsd/drm2/include/asm/cpufeature.h Sun Dec 19 11:52:47 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufeature.h,v 1.8 2021/12/19 11:33:49 riastradh Exp $ */
+/* $NetBSD: cpufeature.h,v 1.9 2021/12/19 11:52:47 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#ifndef _LINUX_ASM_CPUFEATURE_H_
#define _LINUX_ASM_CPUFEATURE_H_
-#include <machine/cpu.h>
+#include <sys/cpu.h>
#if defined(__i386__) || defined(__x86_64__)
Index: src/sys/external/bsd/drm2/include/linux/cpufreq.h
diff -u src/sys/external/bsd/drm2/include/linux/cpufreq.h:1.3 src/sys/external/bsd/drm2/include/linux/cpufreq.h:1.4
--- src/sys/external/bsd/drm2/include/linux/cpufreq.h:1.3 Sun Dec 19 11:46:30 2021
+++ src/sys/external/bsd/drm2/include/linux/cpufreq.h Sun Dec 19 11:52:47 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufreq.h,v 1.3 2021/12/19 11:46:30 riastradh Exp $ */
+/* $NetBSD: cpufreq.h,v 1.4 2021/12/19 11:52:47 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -32,9 +32,10 @@
#ifndef _LINUX_CPUFREQ_H_
#define _LINUX_CPUFREQ_H_
+#include <sys/cpu.h>
#include <sys/cpufreq.h>
#include <sys/kmem.h>
-#include <machine/cpu.h>
+
#include <machine/cpu_counter.h>
struct cpufreq_policy {
