diff options
| author | des <des@FreeBSD.org> | 2006-06-12 18:14:49 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2006-06-12 18:14:49 +0000 |
| commit | 1cdc0bca4fa6c4a5afa3fc24670271c9c066af7f (patch) | |
| tree | 8c7023f0cbcf3dc2d9beba5095753e02f642c06a /sys | |
| parent | 11c5eed170bca086d97ec292a76fb5b95485884d (diff) | |
| download | FreeBSD-src-1cdc0bca4fa6c4a5afa3fc24670271c9c066af7f.zip FreeBSD-src-1cdc0bca4fa6c4a5afa3fc24670271c9c066af7f.tar.gz | |
Add the model name, obtained from the hw.model sysctl variable.
MFC after: 3 weeks
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/compat/linprocfs/linprocfs.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index a77b416..3c39c00 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -185,6 +185,9 @@ linprocfs_domeminfo(PFS_FILL_ARGS) static int linprocfs_docpuinfo(PFS_FILL_ARGS) { + int hw_model[2]; + char model[128]; + size_t size; int class, fqmhz, fqkhz; int i; @@ -229,15 +232,22 @@ linprocfs_docpuinfo(PFS_FILL_ARGS) #endif } + hw_model[0] = CTL_HW; + hw_model[1] = HW_MODEL; + model[0] = '\0'; + size = sizeof(model); + if (kernel_sysctl(td, hw_model, 2, &model, &size, 0, 0, 0, 0) != 0) + strcpy(model, "unknown"); for (i = 0; i < mp_ncpus; ++i) { sbuf_printf(sb, "processor\t: %d\n" "vendor_id\t: %.20s\n" "cpu family\t: %d\n" "model\t\t: %d\n" + "model name\t: %s\n" "stepping\t: %d\n", - i, cpu_vendor, class, cpu, cpu_id & 0xf); - /* XXX per-cpu vendor / class / id? */ + i, cpu_vendor, class, cpu, model, cpu_id & 0xf); + /* XXX per-cpu vendor / class / model / id? */ } sbuf_cat(sb, |
