From e41eeea227e6258aad216de59005e50fe6dc5a61 Mon Sep 17 00:00:00 2001 From: inxi-svn Date: Fri, 7 Aug 2009 00:05:57 +0000 Subject: [PATCH] maybe svn glitch, double checking --- inxi | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/inxi b/inxi index 56e8dd9..3e29046 100755 --- a/inxi +++ b/inxi @@ -1,13 +1,8 @@ #!/bin/bash ######################################################################## #### Script Name: inxi -<<<<<<< .mine #### version: 1.1.12 #### Date: August 6 2009 -======= -#### version: 1.1.12 -#### Date: August 4 2009 ->>>>>>> .r685 ######################################################################## #### SPECIAL THANKS ######################################################################## @@ -2004,11 +1999,11 @@ get_cpu_ht_multicore_smp_data() # looking at logical processor counts over 1, which means either HT, SMP or MCP # http://en.wikipedia.org/wiki/Symmetric_multiprocessing - if ( processor_logical_count > 1 ) { + if ( processor_logical_count > 1 && core_count > 1 ) { if ( processor_logical_count > core_count && physical_cpu_count > 1 ) { type = "SMP-HT" # could be Xeon/P4 HT dual cpu } - else if ( processor_logical_count > core_count && core_count > 1) { + else if ( processor_logical_count > core_count ) { type = "HT" # this is more than likely a P4 w/HT or an Atom 270 } else {