summaryrefslogtreecommitdiffstats
path: root/sys/boot/common
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2007-10-26 21:02:31 +0000
committerjhb <jhb@FreeBSD.org>2007-10-26 21:02:31 +0000
commita7b201ee6db690a943f72f7aa1bd186bc167fe2e (patch)
treeae0ae4a3fd1580506ca25b1f4ffb197a81d3dc02 /sys/boot/common
parent69326388218cd5b94b8d74edbdb9fac55920faba (diff)
downloadFreeBSD-src-a7b201ee6db690a943f72f7aa1bd186bc167fe2e.zip
FreeBSD-src-a7b201ee6db690a943f72f7aa1bd186bc167fe2e.tar.gz
Use the smaller cgbase() macro in ufsread.c if UFS_SMALL_CGBASE is
defined. This lets each boot program choose which version of cgbase() it wants to use rather than forcing ufsread.c to have that knowledge. MFC after: 1 week Discussed with: imp
Diffstat (limited to 'sys/boot/common')
-rw-r--r--sys/boot/common/ufsread.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/boot/common/ufsread.c b/sys/boot/common/ufsread.c
index da06055..2b778bd 100644
--- a/sys/boot/common/ufsread.c
+++ b/sys/boot/common/ufsread.c
@@ -48,10 +48,10 @@ __FBSDID("$FreeBSD$");
#include <ufs/ufs/dinode.h>
#include <ufs/ffs/fs.h>
-#if (defined(__i386__) && !defined(GPTBOOT)) || defined(__arm__)
+#ifdef UFS_SMALL_CGBASE
/* XXX: Revert to old (broken for over 1.5Tb filesystems) version of cgbase
- (see sys/ufs/ffs/fs.h rev 1.39) so that i386 boot loader (boot2) can
- support both UFS1 and UFS2 again. */
+ (see sys/ufs/ffs/fs.h rev 1.39) so that small boot loaders (e.g. boot2) can
+ support both UFS1 and UFS2. */
#undef cgbase
#define cgbase(fs, c) ((ufs2_daddr_t)((fs)->fs_fpg * (c)))
#endif
OpenPOWER on IntegriCloud