diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-04-21 05:33:03 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-04-21 08:44:55 -0400 |
| commit | 64131a87f2aae2ed9e05d8227c5b009ca6c50d98 (patch) | |
| tree | fdea23fd59216120bf54a48c60ca24489a733f14 /include/linux/seqlock.h | |
| parent | 676ee36be04985062522804c2de04f0764212be6 (diff) | |
| parent | 2c33ce009ca2389dbf0535d0672214d09738e35e (diff) | |
Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus
* 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux: (9717 commits)
media-bus: Fixup RGB444_1X12, RGB565_1X16, and YUV8_1X24 media bus format
hexdump: avoid warning in test function
fs: take i_mutex during prepare_binprm for set[ug]id executables
smp: Fix error case handling in smp_call_function_*()
iommu-common: Fix PARISC compile-time warnings
sparc: Make LDC use common iommu poll management functions
sparc: Make sparc64 use scalable lib/iommu-common.c functions
Break up monolithic iommu table/lock into finer graularity pools and lock
sparc: Revert generic IOMMU allocator.
tools/power turbostat: correct dumped pkg-cstate-limit value
tools/power turbostat: calculate TSC frequency from CPUID(0x15) on SKL
tools/power turbostat: correct DRAM RAPL units on recent Xeon processors
tools/power turbostat: Initial Skylake support
tools/power turbostat: Use $(CURDIR) instead of $(PWD) and add support for O= option in Makefile
tools/power turbostat: modprobe msr, if needed
tools/power turbostat: dump MSR_TURBO_RATIO_LIMIT2
tools/power turbostat: use new MSR_TURBO_RATIO_LIMIT names
Bluetooth: hidp: Fix regression with older userspace and flags validation
config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected
perf/x86/intel/pt: Fix and clean up error handling in pt_event_add()
...
That solves several merge conflicts:
Documentation/DocBook/media/v4l/subdev-formats.xml
Documentation/devicetree/bindings/vendor-prefixes.txt
drivers/staging/media/mn88473/mn88473.c
include/linux/kconfig.h
include/uapi/linux/media-bus-format.h
The ones at subdev-formats.xml and media-bus-format.h are not trivial.
That's why we opted to merge from DRM.
Diffstat (limited to 'include/linux/seqlock.h')
| -rw-r--r-- | include/linux/seqlock.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h index f5df8f687b4d..5f68d0a391ce 100644 --- a/include/linux/seqlock.h +++ b/include/linux/seqlock.h | |||
| @@ -108,7 +108,7 @@ static inline unsigned __read_seqcount_begin(const seqcount_t *s) | |||
| 108 | unsigned ret; | 108 | unsigned ret; |
| 109 | 109 | ||
| 110 | repeat: | 110 | repeat: |
| 111 | ret = ACCESS_ONCE(s->sequence); | 111 | ret = READ_ONCE(s->sequence); |
| 112 | if (unlikely(ret & 1)) { | 112 | if (unlikely(ret & 1)) { |
| 113 | cpu_relax(); | 113 | cpu_relax(); |
| 114 | goto repeat; | 114 | goto repeat; |
| @@ -127,7 +127,7 @@ repeat: | |||
| 127 | */ | 127 | */ |
| 128 | static inline unsigned raw_read_seqcount(const seqcount_t *s) | 128 | static inline unsigned raw_read_seqcount(const seqcount_t *s) |
| 129 | { | 129 | { |
| 130 | unsigned ret = ACCESS_ONCE(s->sequence); | 130 | unsigned ret = READ_ONCE(s->sequence); |
| 131 | smp_rmb(); | 131 | smp_rmb(); |
| 132 | return ret; | 132 | return ret; |
| 133 | } | 133 | } |
| @@ -179,7 +179,7 @@ static inline unsigned read_seqcount_begin(const seqcount_t *s) | |||
| 179 | */ | 179 | */ |
| 180 | static inline unsigned raw_seqcount_begin(const seqcount_t *s) | 180 | static inline unsigned raw_seqcount_begin(const seqcount_t *s) |
| 181 | { | 181 | { |
| 182 | unsigned ret = ACCESS_ONCE(s->sequence); | 182 | unsigned ret = READ_ONCE(s->sequence); |
| 183 | smp_rmb(); | 183 | smp_rmb(); |
| 184 | return ret & ~1; | 184 | return ret & ~1; |
| 185 | } | 185 | } |