← Back to branch summary

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

« back to all changes in this revision

Viewing changes to include/linux/percpu-defs.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:
include/linux/percpu-defs.h
69
69
        __PCPU_DUMMY_ATTRS char __pcpu_scope_##name;                    \
70
70
        extern __PCPU_DUMMY_ATTRS char __pcpu_unique_##name;            \
71
71
        __PCPU_DUMMY_ATTRS char __pcpu_unique_##name;                   \
 
72
        extern __PCPU_ATTRS(sec) __typeof__(type) name;                 \
72
73
        __PCPU_ATTRS(sec) PER_CPU_DEF_ATTRIBUTES __weak                 \
73
74
        __typeof__(type) name
74
75
#else