← Back to branch summary

~ubuntu-branches/debian/experimental/linux-tools/experimental

« back to all changes in this revision

Viewing changes to arch/powerpc/include/asm/timex.h

  • Committer: Package Import Robot
  • Author(s): Ben Hutchings
  • Date: 2014-02-02 16:57:49 UTC
  • mfrom: (1.1.10) (0.1.21 sid)
  • Revision ID: package-import@ubuntu.com-20140202165749-tw94o9t1t0a8txk6
Tags: 3.13-1~exp2
Merge changes from sid up to 3.12.6-3

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/powerpc/include/asm/timex.h
29
29
        ret = 0;
30
30
 
31
31
        __asm__ __volatile__(
 
32
#ifdef CONFIG_8xx
 
33
                "97:    mftb %0\n"
 
34
#else
32
35
                "97:    mfspr %0, %2\n"
 
36
#endif
33
37
                "99:\n"
34
38
                ".section __ftr_fixup,\"a\"\n"
35
39
                ".align 2\n"
41
45
                "       .long 0\n"
42
46
                "       .long 0\n"
43
47
                ".previous"
 
48
#ifdef CONFIG_8xx
 
49
                : "=r" (ret) : "i" (CPU_FTR_601));
 
50
#else
44
51
                : "=r" (ret) : "i" (CPU_FTR_601), "i" (SPRN_TBRL));
 
52
#endif
45
53
        return ret;
46
54
#endif
47
55
}