From 1c17ba516034c5b47107f1aa7ed3f85e88b5e8b0 Mon Sep 17 00:00:00 2001 From: Doug MacEachern Date: Tue, 11 Jul 2006 16:32:05 +0000 Subject: [PATCH] fixup cpuid asm #ifdefs to compile on ppc arch --- src/os/linux/linux_sigar.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/os/linux/linux_sigar.c b/src/os/linux/linux_sigar.c index 71f7715d..965fc293 100644 --- a/src/os/linux/linux_sigar.c +++ b/src/os/linux/linux_sigar.c @@ -128,10 +128,10 @@ int sigar_os_open(sigar_t **sigar) (*sigar)->last_proc_stat.pid = -1; -#ifdef __LP64__ - (*sigar)->ht_enabled = 0; -#else +#ifdef __i386__ (*sigar)->ht_enabled = -1; +#else + (*sigar)->ht_enabled = 0; #endif if (stat(PROC_DISKSTATS, &sb) == 0) { @@ -167,6 +167,7 @@ char *sigar_os_error_string(sigar_t *sigar, int err) return NULL; } +#ifdef __i386__ #define INTEL_ID 0x756e6547 static void sigar_cpuid(unsigned long request, @@ -258,6 +259,9 @@ static int is_ht_enabled(sigar_t *sigar) return sigar->ht_enabled; } +#else +#define is_ht_enabled(sigar) 0 +#endif static int get_ram(sigar_t *sigar, sigar_mem_t *mem) {