Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Fix timekeeping on PowerPC 601
  [POWERPC] Don't expose clock vDSO functions when CPU has no timebase
  [POWERPC] spusched: Fix null pointer dereference in find_victim

1 files changed, 12 insertions, 0 deletions

diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index cef01e4e8989..213fa31ac537 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -98,6 +98,18 @@ static struct vdso_patch_def vdso_patches[] = {
                 CPU_FTR_USE_TB, 0,
                 "__kernel_gettimeofday", NULL
         },
+        {
+                CPU_FTR_USE_TB, 0,
+                "__kernel_clock_gettime", NULL
+        },
+        {
+                CPU_FTR_USE_TB, 0,
+                "__kernel_clock_getres", NULL
+        },
+        {
+                CPU_FTR_USE_TB, 0,
+                "__kernel_get_tbfreq", NULL
+        },
 };
 
 /*