diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2018-03-24 08:43:18 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-03-24 08:43:18 +1100 |
| commit | a26cf1c9fe3c2e3b671b490aeb708ea72fb5ac0a (patch) | |
| tree | 1d2061bbf8ac521bb9839075beb4263752bebb23 /arch/powerpc/include/asm/time.h | |
| parent | 78e5dfea84dc15d69940831b3981b3014d17222e (diff) | |
| parent | 681c617b7c42fce0798c2b0b472f270f28c82d56 (diff) | |
| download | linux-stable-a26cf1c9fe3c2e3b671b490aeb708ea72fb5ac0a.tar.gz linux-stable-a26cf1c9fe3c2e3b671b490aeb708ea72fb5ac0a.tar.bz2 linux-stable-a26cf1c9fe3c2e3b671b490aeb708ea72fb5ac0a.zip | |
Merge branch 'topic/ppc-kvm' into next
This brings in two series from Paul, one of which touches KVM code and
may need to be merged into the kvm-ppc tree to resolve conflicts.
Diffstat (limited to 'arch/powerpc/include/asm/time.h')
| -rw-r--r-- | arch/powerpc/include/asm/time.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/time.h b/arch/powerpc/include/asm/time.h index 828ebe7ba7dc..db546c034905 100644 --- a/arch/powerpc/include/asm/time.h +++ b/arch/powerpc/include/asm/time.h @@ -47,7 +47,7 @@ struct div_result { /* Accessor functions for the timebase (RTC on 601) registers. */ /* If one day CONFIG_POWER is added just define __USE_RTC as 1 */ #ifdef CONFIG_6xx -#define __USE_RTC() (!cpu_has_feature(CPU_FTR_USE_TB)) +#define __USE_RTC() (cpu_has_feature(CPU_FTR_USE_RTC)) #else #define __USE_RTC() 0 #endif |