diff options
| author | kchow <none@none> | 2006-02-12 20:51:59 -0800 |
|---|---|---|
| committer | kchow <none@none> | 2006-02-12 20:51:59 -0800 |
| commit | 4944b02ebdb42bbb8031cd6158822d445f03f9de (patch) | |
| tree | f63fe7b51bd0cb185e79fd7c6fd05c5f9391f403 /usr/src/uts/common/conf | |
| parent | 0a64e869f2f81a72b403c27c7550d6576563f79d (diff) | |
| download | illumos-joyent-4944b02ebdb42bbb8031cd6158822d445f03f9de.tar.gz | |
6377034 setting physmem in /etc/system does not have desired effect on x86
6382469 zfs_map() is not initializing all fields in segvn_crargs_t on call to as_map/segvn_create
Diffstat (limited to 'usr/src/uts/common/conf')
| -rw-r--r-- | usr/src/uts/common/conf/param.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/usr/src/uts/common/conf/param.c b/usr/src/uts/common/conf/param.c index 9abf7b0f8a..6519a36a30 100644 --- a/usr/src/uts/common/conf/param.c +++ b/usr/src/uts/common/conf/param.c @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -538,10 +538,19 @@ param_calc(int platform_max_nprocs) * Note: 2^20 is a meg; shifting right by (20 - PAGESHIFT) * converts pages to megs without integer overflow. */ +#if defined(__sparc) if (physmem > original_physmem) { physmem = original_physmem; cmn_err(CE_NOTE, "physmem limited to %ld", physmem); } +#else + if (physmem != original_physmem) { + cmn_err(CE_NOTE, "physmem cannot be modified to 0x%lx" + " via /etc/system. Please use eeprom(1M) instead.", + physmem); + physmem = original_physmem; + } +#endif if (maxusers == 0) { pgcnt_t physmegs = physmem >> (20 - PAGESHIFT); pgcnt_t virtmegs = vmem_size(heap_arena, VMEM_FREE) >> 20; |