summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorTom Cosgrove <tom@cvs.openbsd.org>2004-02-22 19:20:10 +0000
committerTom Cosgrove <tom@cvs.openbsd.org>2004-02-22 19:20:10 +0000
commitf84bdc0cdb84fc9d8767eec5491b79fd0f3f21aa (patch)
tree6ceb9df060da6a7de568aa5943e2ce5fa1c51493 /sys/arch
parent87142c5197a4a0bb73c8e4d480c4393212df6f26 (diff)
- Make comment about parameters passed by /boot reflect reality
- Don't use _C_LABEL() on a parameter given to RELOC(), since RELOC() does this itself ok mickey@
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/amd64/amd64/locore.S10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/amd64/amd64/locore.S b/sys/arch/amd64/amd64/locore.S
index fabbf2eecac..933dcd8db37 100644
--- a/sys/arch/amd64/amd64/locore.S
+++ b/sys/arch/amd64/amd64/locore.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore.S,v 1.4 2004/02/20 20:49:57 deraadt Exp $ */
+/* $OpenBSD: locore.S,v 1.5 2004/02/22 19:20:09 tom Exp $ */
/* $NetBSD: locore.S,v 1.2 2003/04/26 19:34:45 fvdl Exp $ */
/*
@@ -261,14 +261,14 @@ start: movw $0x1234,0x472 # warm boot
/*
* Load parameters from stack
- * (howto, bootdev, bootapiver, esym, cnvmem, extmem, ac, av)
+ * (howto, bootdev, bootapiver, esym, extmem, cnvmem, ac, av)
*/
movl 4(%esp),%eax
- movl %eax,RELOC(_C_LABEL(boothowto))
+ movl %eax, RELOC(boothowto)
movl 8(%esp),%eax
- movl %eax,RELOC(_C_LABEL(bootdev))
+ movl %eax, RELOC(bootdev)
- movl 16(%esp), %eax
+ movl 16(%esp), %eax
testl %eax,%eax
jz 1f
addl $KERNBASE_LO,%eax