← Back to branch summary

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

« back to all changes in this revision

Viewing changes to arch/s390/include/asm/vdso.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/s390/include/asm/vdso.h
26
26
        __u64 wtom_clock_nsec;          /*                              0x28 */
27
27
        __u32 tz_minuteswest;           /* Minutes west of Greenwich    0x30 */
28
28
        __u32 tz_dsttime;               /* Type of dst correction       0x34 */
29
 
        __u32 ectg_available;
30
 
        __u32 ntp_mult;                 /* NTP adjusted multiplier      0x3C */
 
29
        __u32 ectg_available;           /* ECTG instruction present     0x38 */
 
30
        __u32 tk_mult;                  /* Mult. used for xtime_nsec    0x3c */
 
31
        __u32 tk_shift;                 /* Shift used for xtime_nsec    0x40 */
31
32
};
32
33
 
33
34
struct vdso_per_cpu_data {