From f80f065ff5bca1363eaa1078cc46d22e1245846f Mon Sep 17 00:00:00 2001
From: skrll <skrll@NetBSD.org>
Date: Mon, 31 Jan 2011 12:10:58 +0000
Subject: [PATCH] This file needs opt_multiprocessor.h early so we pick up the
 right definition from cpu.h, etc.

XXX should revisit the _STANDALONE vs _KERNEL split
---
 sys/lib/libkern/arch/hppa/bcopy.S | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/sys/lib/libkern/arch/hppa/bcopy.S b/sys/lib/libkern/arch/hppa/bcopy.S
index 07eee0e6e155..98dc80c61bb5 100644
--- a/sys/lib/libkern/arch/hppa/bcopy.S
+++ b/sys/lib/libkern/arch/hppa/bcopy.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: bcopy.S,v 1.13 2011/01/24 15:01:30 skrll Exp $	*/
+/*	$NetBSD: bcopy.S,v 1.14 2011/01/31 12:10:58 skrll Exp $	*/
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -36,13 +36,20 @@
 #undef _LOCORE
 #define _LOCORE	/* XXX fredette - unfortunate */
 
+#if defined(SPCOPY) && !defined(_STANDALONE)
+
+#include "opt_multiprocessor.h"
+
 #include <machine/cpu.h>
+
+#endif
+
 #include <machine/asm.h>
 #include <machine/frame.h>
 #include <machine/reg.h>
 
 #if defined(LIBC_SCCS) && !defined(lint)
-RCSID("$NetBSD: bcopy.S,v 1.13 2011/01/24 15:01:30 skrll Exp $")
+RCSID("$NetBSD: bcopy.S,v 1.14 2011/01/31 12:10:58 skrll Exp $")
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -486,8 +493,6 @@ RCSID("$NetBSD: bcopy.S,v 1.13 2011/01/24 15:01:30 skrll Exp $")
 
 #if defined(SPCOPY) && !defined(_STANDALONE)
 
-#include "opt_multiprocessor.h"
-
 #include <sys/errno.h>
 #include "assym.h"