Merge tag 'v4.12-rc6' into patchwork
Linux 4.12-rc6 * tag 'v4.12-rc6': (813 commits) Linux 4.12-rc6 mm: larger stack guard gap, between vmas virtio_balloon: disable VIOMMU support mm: correct the comment when reclaimed pages exceed the scanned pages userfaultfd: shmem: handle coredumping in handle_userfault() mm: numa: avoid waiting on freed migrated pages swap: cond_resched in swap_cgroup_prepare() mm/memory-failure.c: use compound_head() flags for huge pages perf unwind: Report module before querying isactivation in dwfl unwind fs: pass on flags in compat_writev objtool: Add fortify_panic as __noreturn function powerpc/debug: Add missing warn flag to WARN_ON's non-builtin path USB: gadgetfs, dummy-hcd, net2280: fix locking for callbacks drm: mxsfb_crtc: Reset the eLCDIF controller drm/mgag200: Fix to always set HiPri for G200e4 V2 i2c: ismt: fix wrong device address when unmap the data buffer i2c: rcar: use correct length when unmapping DMA powerpc/xive: Fix offset for store EOI MMIOs drm/tegra: Correct idr_alloc() minimum id drm/tegra: Fix lockup on a use of staging API ... Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
@@ -493,10 +493,10 @@ static int vdec_h264_get_param(unsigned long h_vdec,
|
||||
}
|
||||
|
||||
static struct vdec_common_if vdec_h264_if = {
|
||||
vdec_h264_init,
|
||||
vdec_h264_decode,
|
||||
vdec_h264_get_param,
|
||||
vdec_h264_deinit,
|
||||
.init = vdec_h264_init,
|
||||
.decode = vdec_h264_decode,
|
||||
.get_param = vdec_h264_get_param,
|
||||
.deinit = vdec_h264_deinit,
|
||||
};
|
||||
|
||||
struct vdec_common_if *get_h264_dec_comm_if(void);
|
||||
|
@@ -620,10 +620,10 @@ static void vdec_vp8_deinit(unsigned long h_vdec)
|
||||
}
|
||||
|
||||
static struct vdec_common_if vdec_vp8_if = {
|
||||
vdec_vp8_init,
|
||||
vdec_vp8_decode,
|
||||
vdec_vp8_get_param,
|
||||
vdec_vp8_deinit,
|
||||
.init = vdec_vp8_init,
|
||||
.decode = vdec_vp8_decode,
|
||||
.get_param = vdec_vp8_get_param,
|
||||
.deinit = vdec_vp8_deinit,
|
||||
};
|
||||
|
||||
struct vdec_common_if *get_vp8_dec_comm_if(void);
|
||||
|
@@ -979,10 +979,10 @@ static int vdec_vp9_get_param(unsigned long h_vdec,
|
||||
}
|
||||
|
||||
static struct vdec_common_if vdec_vp9_if = {
|
||||
vdec_vp9_init,
|
||||
vdec_vp9_decode,
|
||||
vdec_vp9_get_param,
|
||||
vdec_vp9_deinit,
|
||||
.init = vdec_vp9_init,
|
||||
.decode = vdec_vp9_decode,
|
||||
.get_param = vdec_vp9_get_param,
|
||||
.deinit = vdec_vp9_deinit,
|
||||
};
|
||||
|
||||
struct vdec_common_if *get_vp9_dec_comm_if(void);
|
||||
|
Reference in New Issue
Block a user