From 3b681182f2e48b41922528f1e743483ff9a65a95 Mon Sep 17 00:00:00 2001
From: Simon Schubert <corecode@dragonflybsd.org>
Date: Sun, 30 Aug 2009 10:55:58 +0200
Subject: [PATCH] amd64: sync missing functions/config from i386

---
 sys/cpu/amd64/include/cpufunc.h |  6 ++++++
 sys/platform/pc64/conf/files    |  1 +
 sys/platform/pc64/conf/options  | 24 +++++++++++++++---------
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/sys/cpu/amd64/include/cpufunc.h b/sys/cpu/amd64/include/cpufunc.h
index 2b92073beb..7969e19508 100644
--- a/sys/cpu/amd64/include/cpufunc.h
+++ b/sys/cpu/amd64/include/cpufunc.h
@@ -388,6 +388,12 @@ cpu_invlpg(void *addr)
 
 #endif
 
+static __inline void
+cpu_nop(void)
+{
+	__asm __volatile("rep; nop");
+}
+
 #endif	/* _KERNEL */
 
 static __inline u_short
diff --git a/sys/platform/pc64/conf/files b/sys/platform/pc64/conf/files
index 77d6ed0bcd..8019f2115d 100644
--- a/sys/platform/pc64/conf/files
+++ b/sys/platform/pc64/conf/files
@@ -154,6 +154,7 @@ kern/syscalls.c			standard
 platform/pc64/amd64/mp_machdep.c		optional	smp
 dev/misc/atkbd/atkbd_isa.c		optional	atkbd
 dev/misc/atkbdc_layer/atkbdc_isa.c	optional	atkbdc
+dev/misc/ppc/ppc.c			optional	ppc
 dev/misc/psm/psm.c			optional	psm
 dev/serial/sio/sio.c			optional	sio
 bus/isa/syscons_isa.c			optional	sc
diff --git a/sys/platform/pc64/conf/options b/sys/platform/pc64/conf/options
index 0ce4868f48..c2244a64ea 100644
--- a/sys/platform/pc64/conf/options
+++ b/sys/platform/pc64/conf/options
@@ -2,6 +2,21 @@
 # $DragonFly: src/sys/platform/pc64/conf/options,v 1.4 2008/08/29 17:07:15 dillon Exp $
 #
 
+DISABLE_PSE
+PMAP_SHPGPERPROC	opt_pmap.h
+PPC_PROBE_CHIPSET	opt_ppc.h
+PPC_DEBUG		opt_ppc.h
+SHOW_BUSYBUFS
+PANIC_REBOOT_WAIT_TIME	opt_panic.h
+MAXMEM
+PERFMON			opt_perfmon.h
+POWERFAIL_NMI		opt_trap.h
+AUTO_EOI_1		opt_auto_eoi.h
+AUTO_EOI_2		opt_auto_eoi.h
+CONSPEED		opt_comconsole.h
+I586_PMC_GUPROF		opt_i586_guprof.h
+BROKEN_KEYBOARD_RESET	opt_reset.h
+
 # amd64 SMP options
 APIC_IO			opt_global.h
 
@@ -46,12 +61,3 @@ KBD_MAXRETRY		opt_kbd.h
 KBD_MAXWAIT		opt_kbd.h
 KBD_RESETDELAY		opt_kbd.h
 KBDIO_DEBUG		opt_kbd.h
-
-#
-#
-SHOW_BUSYBUFS
-PANIC_REBOOT_WAIT_TIME  opt_panic.h
-
-AUTO_EOI_1		opt_auto_eoi.h
-AUTO_EOI_2		opt_auto_eoi.h
-
-- 
2.41.0