summaryrefslogtreecommitdiffstats
path: root/sys/amd64
diff options
context:
space:
mode:
authormsmith <msmith@FreeBSD.org>1998-08-03 21:31:32 +0000
committermsmith <msmith@FreeBSD.org>1998-08-03 21:31:32 +0000
commit0676197d78cffbc4ec52cc442aafa56418c954a6 (patch)
tree4729c03feb1f731089990174473e29aa4c155a5c /sys/amd64
parentcea30ae5fe3b15473891054433184be4913306b2 (diff)
downloadFreeBSD-src-0676197d78cffbc4ec52cc442aafa56418c954a6.zip
FreeBSD-src-0676197d78cffbc4ec52cc442aafa56418c954a6.tar.gz
Copy in the nfs_diskless structure if NFS_ROOT is defined. A previous
change to include nfs_root.h precluded NFS from being defined. Submitted by: Parag Patel <parag@cgt.com>
Diffstat (limited to 'sys/amd64')
-rw-r--r--sys/amd64/amd64/locore.S4
-rw-r--r--sys/amd64/amd64/locore.s4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S
index e788b7c..2ea4af3 100644
--- a/sys/amd64/amd64/locore.S
+++ b/sys/amd64/amd64/locore.S
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)locore.s 7.3 (Berkeley) 5/13/91
- * $Id: locore.s,v 1.110 1998/06/30 03:01:35 jmg Exp $
+ * $Id: locore.s,v 1.111 1998/07/27 16:45:01 jlemon Exp $
*
* originally from: locore.s, by William F. Jolitz
*
@@ -569,7 +569,7 @@ got_common_bi_size:
rep
movsb
-#ifdef NFS
+#ifdef NFS_ROOT
#ifndef BOOTP_NFSV3
/*
* If we have a nfs_diskless structure copy it in
diff --git a/sys/amd64/amd64/locore.s b/sys/amd64/amd64/locore.s
index e788b7c..2ea4af3 100644
--- a/sys/amd64/amd64/locore.s
+++ b/sys/amd64/amd64/locore.s
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)locore.s 7.3 (Berkeley) 5/13/91
- * $Id: locore.s,v 1.110 1998/06/30 03:01:35 jmg Exp $
+ * $Id: locore.s,v 1.111 1998/07/27 16:45:01 jlemon Exp $
*
* originally from: locore.s, by William F. Jolitz
*
@@ -569,7 +569,7 @@ got_common_bi_size:
rep
movsb
-#ifdef NFS
+#ifdef NFS_ROOT
#ifndef BOOTP_NFSV3
/*
* If we have a nfs_diskless structure copy it in
OpenPOWER on IntegriCloud