diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2021-03-30 17:10:04 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2021-03-30 17:10:04 +0200 |
| commit | 7a842f5f3a816a818dc89e4ec4cffb7a32a38543 (patch) | |
| tree | 2fd15f52c696715e7ac924bd24c663c8ad0ce7e7 /include/linux | |
| parent | 93fb0db791be7e8df3d91d046a4259e341782972 (diff) | |
| parent | 9b39031dfb888804c0393ae4156223b476c699b4 (diff) | |
Merge 4.4.264 into android-4.4-p
Changes in 4.4.264
net: fec: ptp: avoid register access when ipg clock is disabled
powerpc/4xx: Fix build errors from mfdcr()
atm: eni: dont release is never initialized
atm: lanai: dont run lanai_dev_close if not open
net: tehuti: fix error return code in bdx_probe()
sun/niu: fix wrong RXMAC_BC_FRM_CNT_COUNT count
nfs: fix PNFS_FLEXFILE_LAYOUT Kconfig default
NFS: Correct size calculation for create reply length
atm: uPD98402: fix incorrect allocation
atm: idt77252: fix null-ptr-dereference
u64_stats,lockdep: Fix u64_stats_init() vs lockdep
nfs: we don't support removing system.nfs4_acl
ia64: fix ia64_syscall_get_set_arguments() for break-based syscalls
ia64: fix ptrace(PTRACE_SYSCALL_INFO_EXIT) sign
x86/tlb: Flush global mappings when KAISER is disabled
squashfs: fix inode lookup sanity checks
squashfs: fix xattr id and id lookup sanity checks
bus: omap_l3_noc: mark l3 irqs as IRQF_NO_THREAD
macvlan: macvlan_count_rx() needs to be aware of preemption
net: dsa: bcm_sf2: Qualify phydev->dev_flags based on port
e1000e: add rtnl_lock() to e1000_reset_task
e1000e: Fix error handling in e1000_set_d0_lplu_state_82571
net/qlcnic: Fix a use after free in qlcnic_83xx_get_minidump_template
can: c_can_pci: c_can_pci_remove(): fix use-after-free
can: c_can: move runtime PM enable/disable to c_can_platform
can: m_can: m_can_do_rx_poll(): fix extraneous msg loss warning
mac80211: fix rate mask reset
net: cdc-phonet: fix data-interface release on probe failure
RDMA/cxgb4: Fix adapter LE hash errors while destroying ipv6 listening server
perf auxtrace: Fix auxtrace queue conflict
can: dev: Move device back to init netns on owning netns delete
net: sched: validate stab values
mac80211: fix double free in ibss_leave
xen-blkback: don't leak persistent grants from xen_blkbk_map()
Linux 4.4.264
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia5e96dcf0093856869326d47098ca43a42a88b35
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/if_macvlan.h | 3 | ||||
| -rw-r--r-- | include/linux/u64_stats_sync.h | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h index a4ccc3122f93..cfcbc49f4ddf 100644 --- a/include/linux/if_macvlan.h +++ b/include/linux/if_macvlan.h @@ -70,13 +70,14 @@ static inline void macvlan_count_rx(const struct macvlan_dev *vlan, if (likely(success)) { struct vlan_pcpu_stats *pcpu_stats; - pcpu_stats = this_cpu_ptr(vlan->pcpu_stats); + pcpu_stats = get_cpu_ptr(vlan->pcpu_stats); u64_stats_update_begin(&pcpu_stats->syncp); pcpu_stats->rx_packets++; pcpu_stats->rx_bytes += len; if (multicast) pcpu_stats->rx_multicast++; u64_stats_update_end(&pcpu_stats->syncp); + put_cpu_ptr(vlan->pcpu_stats); } else { this_cpu_inc(vlan->pcpu_stats->rx_errors); } diff --git a/include/linux/u64_stats_sync.h b/include/linux/u64_stats_sync.h index df89c9bcba7d..7b38288dc239 100644 --- a/include/linux/u64_stats_sync.h +++ b/include/linux/u64_stats_sync.h @@ -68,12 +68,13 @@ struct u64_stats_sync { }; +#if BITS_PER_LONG == 32 && defined(CONFIG_SMP) +#define u64_stats_init(syncp) seqcount_init(&(syncp)->seq) +#else static inline void u64_stats_init(struct u64_stats_sync *syncp) { -#if BITS_PER_LONG == 32 && defined(CONFIG_SMP) - seqcount_init(&syncp->seq); -#endif } +#endif static inline void u64_stats_update_begin(struct u64_stats_sync *syncp) { |