Merge branch 'master' into gfio

[fio.git] / arch / arch-ppc.h

diff --git a/arch/arch-ppc.h b/arch/arch-ppc.h
index 87198699edaa0bf21d23d3e538cbf2f9d4008a02..e73093df86f5f25ed68c44e4e3662d1ab3210891 100644 (file)
--- a/arch/arch-ppc.h
+++ b/arch/arch-ppc.h
@@ -1,7 +1,7 @@
 #ifndef ARCH_PPC_H
 #define ARCH_PPH_H
 
-#define ARCH   (arch_ppc)
+#define FIO_ARCH       (arch_ppc)
 
 #ifndef __NR_ioprio_set
 #define __NR_ioprio_set                273
@@ -45,17 +45,25 @@ static inline int arch_ffz(unsigned long bitmask)
 
 static inline unsigned long long get_cpu_clock(void)
 {
-    unsigned int tbl, tbu0, tbu1;
-    unsigned long long ret;
+       unsigned int tbl, tbu0, tbu1;
+       unsigned long long ret;
 
-    do {
-        __asm__ __volatile__ ("mftbu %0" : "=r"(tbu0));
-        __asm__ __volatile__ ("mftb %0"  : "=r"(tbl) );
-        __asm__ __volatile__ ("mftbu %0" : "=r"(tbu1));
-     } while (tbu0 != tbu1);
+       do {
+               __asm__ __volatile__ ("mftbu %0" : "=r"(tbu0));
+               __asm__ __volatile__ ("mftb %0"  : "=r"(tbl) );
+               __asm__ __volatile__ ("mftbu %0" : "=r"(tbu1));
+       } while (tbu0 != tbu1);
 
-    ret = (((unsigned long long)tbu0) << 32) | tbl;
-    return ret;
+       ret = (((unsigned long long)tbu0) << 32) | tbl;
+       return ret;
+}
+
+#define ARCH_HAVE_INIT
+extern int tsc_reliable;
+static inline int arch_init(char *envp[])
+{
+       tsc_reliable = 1;
+       return 0;
 }
 
 #define ARCH_HAVE_FFZ