diff --git a/inxi b/inxi index 29dc91c..321e1fe 100755 --- a/inxi +++ b/inxi @@ -1,7 +1,7 @@ #!/bin/bash ######################################################################## #### Script Name: inxi -#### version: 1.4.11 +#### version: 1.4.12 #### Date: Jule 24 2010 ######################################################################## #### SPECIAL THANKS @@ -2089,14 +2089,18 @@ get_cpu_ht_multicore_smp_data() # if = 1 processor then single core/processor Uni-Processor (UP) if ( num_of_processors > 1 ) { - if ( num_of_processors == (num_of_cores * 2 )) + # non-multicore HT + if ( num_of_processors == (num_of_cores * 2)) { type = type "HT-" } - if ( num_of_processors >= num_of_cores ) + # non-HT multi-core or HT multi-core + if (( num_of_processors == num_of_cores) || + ( num_of_cpus < num_of_cores)) { type = type "MCP-" } + # >1 cpu sockets active if ( num_of_cpus > 1 ) { type = type "SMP-"