From c722ec3a5151fdba885b451d2a50a58f327ff994 Mon Sep 17 00:00:00 2001
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sun, 28 Jul 2013 18:35:43 +0000
Subject: [PATCH] remove needless inclusion of machine/cpu.h in userland

MFC after:	21 days
---
 lib/libc/powerpc/gen/syncicache.c   | 1 -
 lib/libc/powerpc64/gen/syncicache.c | 1 -
 libexec/rtld-elf/powerpc/reloc.c    | 1 -
 libexec/rtld-elf/powerpc64/reloc.c  | 1 -
 sbin/adjkerntz/adjkerntz.c          | 1 -
 share/examples/perfmon/perfmon.c    | 1 -
 tools/tools/vhba/vhba.h             | 1 -
 usr.bin/w/w.c                       | 1 -
 8 files changed, 8 deletions(-)

diff --git a/lib/libc/powerpc/gen/syncicache.c b/lib/libc/powerpc/gen/syncicache.c
index 434dcec63416..b8b4a16e6257 100644
--- a/lib/libc/powerpc/gen/syncicache.c
+++ b/lib/libc/powerpc/gen/syncicache.c
@@ -44,7 +44,6 @@ static const char rcsid[] =
 #endif
 #include <sys/sysctl.h>
 
-#include <machine/cpu.h>
 #include <machine/md_var.h>
 
 #ifdef _STANDALONE
diff --git a/lib/libc/powerpc64/gen/syncicache.c b/lib/libc/powerpc64/gen/syncicache.c
index 1267c9fcc366..3fe6e1a1350a 100644
--- a/lib/libc/powerpc64/gen/syncicache.c
+++ b/lib/libc/powerpc64/gen/syncicache.c
@@ -44,7 +44,6 @@ static const char rcsid[] =
 #endif
 #include <sys/sysctl.h>
 
-#include <machine/cpu.h>
 #include <machine/md_var.h>
 
 #ifdef _STANDALONE
diff --git a/libexec/rtld-elf/powerpc/reloc.c b/libexec/rtld-elf/powerpc/reloc.c
index 838cfe6f5157..2dd27c7ae581 100644
--- a/libexec/rtld-elf/powerpc/reloc.c
+++ b/libexec/rtld-elf/powerpc/reloc.c
@@ -37,7 +37,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <machine/cpu.h>
 #include <machine/atomic.h>
 #include <machine/md_var.h>
 
diff --git a/libexec/rtld-elf/powerpc64/reloc.c b/libexec/rtld-elf/powerpc64/reloc.c
index fb5325f23dc0..74725a043059 100644
--- a/libexec/rtld-elf/powerpc64/reloc.c
+++ b/libexec/rtld-elf/powerpc64/reloc.c
@@ -37,7 +37,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <machine/cpu.h>
 #include <machine/md_var.h>
 
 #include "debug.h"
diff --git a/sbin/adjkerntz/adjkerntz.c b/sbin/adjkerntz/adjkerntz.c
index c42379d71915..34514478a990 100644
--- a/sbin/adjkerntz/adjkerntz.c
+++ b/sbin/adjkerntz/adjkerntz.c
@@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$");
 #include <syslog.h>
 #include <sys/time.h>
 #include <sys/param.h>
-#include <machine/cpu.h>
 #include <sys/sysctl.h>
 
 #include "pathnames.h"
diff --git a/share/examples/perfmon/perfmon.c b/share/examples/perfmon/perfmon.c
index edac9bd857aa..97283a22679a 100644
--- a/share/examples/perfmon/perfmon.c
+++ b/share/examples/perfmon/perfmon.c
@@ -32,7 +32,6 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 
-#include <machine/cpu.h>
 #include <machine/perfmon.h>
 
 #include <stdio.h>
diff --git a/tools/tools/vhba/vhba.h b/tools/tools/vhba/vhba.h
index c09bd000de3e..2673e77fe259 100644
--- a/tools/tools/vhba/vhba.h
+++ b/tools/tools/vhba/vhba.h
@@ -43,7 +43,6 @@
 #include <sys/proc.h>
 
 #include <machine/bus.h>
-#include <machine/cpu.h>
 #include <machine/stdarg.h>
 
 #include <cam/cam.h>
diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c
index 1b9af5f0cc33..8054bbebbb9c 100644
--- a/usr.bin/w/w.c
+++ b/usr.bin/w/w.c
@@ -57,7 +57,6 @@ static const char sccsid[] = "@(#)w.c	8.4 (Berkeley) 4/16/94";
 #include <sys/socket.h>
 #include <sys/tty.h>
 
-#include <machine/cpu.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <arpa/nameser.h>