diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-11-18 17:48:34 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-11-18 17:48:34 -0800 |
| commit | 7f687eb12e9977215416469c3edfc9f464a5883c (patch) | |
| tree | 48968be59a419d1248a12b026256069f02eded5e | |
| parent | 9b2c88495d0bd7171a0b84d3594ea80d4e97247c (diff) | |
| download | bionic-7f687eb12e9977215416469c3edfc9f464a5883c.zip bionic-7f687eb12e9977215416469c3edfc9f464a5883c.tar.gz bionic-7f687eb12e9977215416469c3edfc9f464a5883c.tar.bz2 | |
Revert "bionic: Update mechanism to detect number of CPU's for msm targets"
This reverts commit a2e0be9822c9bbb0e6bc479ee970bdfed20e8ec9.
| -rw-r--r-- | libc/Android.mk | 4 | ||||
| -rw-r--r-- | libc/unistd/sysconf.c | 16 |
2 files changed, 0 insertions, 20 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index b0ddb3c..ec8a73d 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -471,10 +471,6 @@ libc_common_cflags := \ -DPOSIX_MISTAKE \ -DLOG_ON_HEAP_ERROR \ -ifeq ($(BOARD_USES_QCOM_HARDWARE),true) -libc_common_cflags += -DQCOM_HARDWARE -endif - # these macro definitions are required to implement the # 'timezone' and 'daylight' global variables, as well as # properly update the 'tm_gmtoff' field in 'struct tm'. diff --git a/libc/unistd/sysconf.c b/libc/unistd/sysconf.c index c6bf000..9377802 100644 --- a/libc/unistd/sysconf.c +++ b/libc/unistd/sysconf.c @@ -367,19 +367,11 @@ __get_nproc_conf(void) const char* p; int count = 0; -#ifdef QCOM_HARDWARE - if (line_parser_init(parser, "/sys/devices/system/cpu/present") < 0) -#else if (line_parser_init(parser, "/proc/cpuinfo") < 0) -#endif return 1; while ((p = line_parser_gets(parser))) { -#ifdef QCOM_HARDWARE - if ( sscanf(p, "0-%d", &count) == 1 ) -#else if ( !memcmp(p, "processor", 9) ) -#endif count += 1; } return (count < 1) ? 1 : count; @@ -393,19 +385,11 @@ __get_nproc_onln(void) const char* p; int count = 0; -#ifdef QCOM_HARDWARE - if (line_parser_init(parser, "/sys/devices/system/cpu/present") < 0) -#else if (line_parser_init(parser, "/proc/stat") < 0) -#endif return 1; while ((p = line_parser_gets(parser))) { -#ifdef QCOM_HARDWARE - if ( sscanf(p, "0-%d", &count) == 1 ) -#else if ( !memcmp(p, "cpu", 3) && isdigit(p[3]) ) -#endif count += 1; } return (count < 1) ? 1 : count; |