diff options
| author | Emanuele Ghidoli <emanuele.ghidoli@toradex.com> | 2023-08-28 17:57:21 +0200 |
|---|---|---|
| committer | Emanuele Ghidoli <emanuele.ghidoli@toradex.com> | 2023-08-28 17:57:21 +0200 |
| commit | 4ec771793b5034132b5fc7459fef4de648428f8a (patch) | |
| tree | 205924468f8cf1319b9fe446e248a5f8cd52e6ed /include | |
| parent | ab46319ada275b735d559d479d1fb45e57cc495c (diff) | |
| parent | 60b502b3ffea07de3d741d79a22da1092b7a8657 (diff) | |
Merge tag 'v5.15.95' into 5.15-2.2.x-imx
This is the 5.15.95 stable release
Conflicts:
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
net/sched/act_ctinfo.c
Signed-off-by: Emanuele Ghidoli <emanuele.ghidoli@toradex.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/acpi.h | 10 | ||||
| -rw-r--r-- | include/linux/hugetlb.h | 5 | ||||
| -rw-r--r-- | include/linux/stmmac.h | 1 | ||||
| -rw-r--r-- | include/net/sock.h | 13 |
4 files changed, 27 insertions, 2 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 6224b1e32681..2d7df5cea249 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -1005,7 +1005,15 @@ void acpi_os_set_prepare_extended_sleep(int (*func)(u8 sleep_state, acpi_status acpi_os_prepare_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b); - +#ifdef CONFIG_X86 +struct acpi_s2idle_dev_ops { + struct list_head list_node; + void (*prepare)(void); + void (*restore)(void); +}; +int acpi_register_lps0_dev(struct acpi_s2idle_dev_ops *arg); +void acpi_unregister_lps0_dev(struct acpi_s2idle_dev_ops *arg); +#endif /* CONFIG_X86 */ #ifndef CONFIG_IA64 void arch_reserve_mem_area(acpi_physical_address addr, size_t size); #else diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index f98d747f983b..4ede8df5818e 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -684,7 +684,10 @@ static inline struct hstate *hstate_sizelog(int page_size_log) if (!page_size_log) return &default_hstate; - return size_to_hstate(1UL << page_size_log); + if (page_size_log < BITS_PER_LONG) + return size_to_hstate(1UL << page_size_log); + + return NULL; } static inline struct hstate *hstate_vma(struct vm_area_struct *vma) diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h index 48d015ed2175..cc338c6c7495 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -251,6 +251,7 @@ struct plat_stmmacenet_data { int rss_en; int mac_port_sel_speed; bool en_tx_lpi_clockgating; + bool rx_clk_runs_in_lpi; int has_xgmac; bool vlan_fail_q_en; u8 vlan_fail_q; diff --git a/include/net/sock.h b/include/net/sock.h index 3e9db5146765..cd6f2ae28ecf 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -2315,6 +2315,19 @@ static inline __must_check bool skb_set_owner_sk_safe(struct sk_buff *skb, struc return false; } +static inline struct sk_buff *skb_clone_and_charge_r(struct sk_buff *skb, struct sock *sk) +{ + skb = skb_clone(skb, sk_gfp_mask(sk, GFP_ATOMIC)); + if (skb) { + if (sk_rmem_schedule(sk, skb, skb->truesize)) { + skb_set_owner_r(skb, sk); + return skb; + } + __kfree_skb(skb); + } + return NULL; +} + static inline void skb_prepare_for_gro(struct sk_buff *skb) { if (skb->destructor != sock_wfree) { |