Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[mirror_ubuntu-artful-kernel.git] / arch / powerpc / kernel / kgdb.c

diff --git a/arch/powerpc/kernel/kgdb.c b/arch/powerpc/kernel/kgdb.c
index 8504657379f13fe7858f08b9f4f61ea4e23ecb92..e77c3ccf8dcfe432c6f7e7b761cb64a67afa3bed 100644 (file)
--- a/arch/powerpc/kernel/kgdb.c
+++ b/arch/powerpc/kernel/kgdb.c
@@ -155,7 +155,7 @@ static int kgdb_singlestep(struct pt_regs *regs)
 {
        struct thread_info *thread_info, *exception_thread_info;
        struct thread_info *backup_current_thread_info =
-               &__get_cpu_var(kgdb_thread_info);
+               this_cpu_ptr(&kgdb_thread_info);
 
        if (user_mode(regs))
                return 0;