Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
-- net/ipv4/ip_output.c | 11 +++++++++--
++ net/ipv4/ip_output.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
--diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
--index 25beecee89494..06a981676356c 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
--@@ -160,12 +160,19 @@ int ip_build_and_send_pkt(struct sk_buff *skb, const struct sock *sk,
++@@ -160,12 +160,19 @@ int ip_build_and_send_pkt(struct sk_buff
iph->daddr = (opt && opt->opt.srr ? opt->opt.faddr : daddr);
iph->saddr = saddr;
iph->protocol = sk->sk_protocol;
}
if (opt && opt->opt.optlen) {
----
--2.34.1
--
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
-- net/ipv4/ip_output.c | 11 +++++++++--
++ net/ipv4/ip_output.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
--diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
--index 477540b3d3207..efd4410a73587 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
--@@ -155,12 +155,19 @@ int ip_build_and_send_pkt(struct sk_buff *skb, const struct sock *sk,
++@@ -155,12 +155,19 @@ int ip_build_and_send_pkt(struct sk_buff
iph->daddr = (opt && opt->opt.srr ? opt->opt.faddr : daddr);
iph->saddr = saddr;
iph->protocol = sk->sk_protocol;
}
if (opt && opt->opt.optlen) {
----
--2.34.1
--
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
-- net/ipv4/ip_output.c | 11 +++++++++--
++ net/ipv4/ip_output.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
--diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
--index 589fd0904e0de..bd53136c28262 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
--@@ -159,12 +159,19 @@ int ip_build_and_send_pkt(struct sk_buff *skb, const struct sock *sk,
++@@ -159,12 +159,19 @@ int ip_build_and_send_pkt(struct sk_buff
iph->daddr = (opt && opt->opt.srr ? opt->opt.faddr : daddr);
iph->saddr = saddr;
iph->protocol = sk->sk_protocol;
}
if (opt && opt->opt.optlen) {
----
--2.34.1
--
Signed-off-by: Sander Vanheule <sander@svanheule.net>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/177b920aa8d8610615692d0e657e509f363c85ca.1641739718.git.sander@svanheule.net
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+ Signed-off-by: Sasha Levin <sashal@kernel.org>
---
- drivers/irqchip/irq-realtek-rtl.c | 8 +++++---
+ drivers/irqchip/irq-realtek-rtl.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
-diff --git a/drivers/irqchip/irq-realtek-rtl.c b/drivers/irqchip/irq-realtek-rtl.c
-index d6788dd93c7bb..568614edd88f4 100644
--- a/drivers/irqchip/irq-realtek-rtl.c
+++ b/drivers/irqchip/irq-realtek-rtl.c
-@@ -95,7 +95,8 @@ static void realtek_irq_dispatch(struct irq_desc *desc)
+@@ -95,7 +95,8 @@ out:
* SoC interrupts are cascaded to MIPS CPU interrupts according to the
* interrupt-map in the device tree. Each SoC interrupt gets 4 bits for
* the CPU interrupt in an Interrupt Routing Register. Max 32 SoC interrupts
Signed-off-by: Sander Vanheule <sander@svanheule.net>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/4b4936606480265db47df152f00bc2ed46340599.1641739718.git.sander@svanheule.net
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+ Signed-off-by: Sasha Levin <sashal@kernel.org>
---
- drivers/irqchip/irq-realtek-rtl.c | 2 +-
+ drivers/irqchip/irq-realtek-rtl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/drivers/irqchip/irq-realtek-rtl.c b/drivers/irqchip/irq-realtek-rtl.c
-index fd9f275592d29..d6788dd93c7bb 100644
--- a/drivers/irqchip/irq-realtek-rtl.c
+++ b/drivers/irqchip/irq-realtek-rtl.c
-@@ -62,7 +62,7 @@ static struct irq_chip realtek_ictl_irq = {
+@@ -62,7 +62,7 @@ static struct irq_chip realtek_ictl_irq
static int intc_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hw)
{
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20220124195808.2252071-1-namhyung@kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+ Signed-off-by: Sasha Levin <sashal@kernel.org>
---
- kernel/events/core.c | 11 +++++++++--
+ kernel/events/core.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
-diff --git a/kernel/events/core.c b/kernel/events/core.c
-index 0153f8f972834..c7581e3fb8ab1 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
-@@ -2458,7 +2458,11 @@ static void perf_remove_from_context(struct perf_event *event, unsigned long fla
+@@ -2458,7 +2458,11 @@ static void perf_remove_from_context(str
* event_function_call() user.
*/
raw_spin_lock_irq(&ctx->lock);
Signed-off-by: Sander Vanheule <sander@svanheule.net>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/177b920aa8d8610615692d0e657e509f363c85ca.1641739718.git.sander@svanheule.net
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+ Signed-off-by: Sasha Levin <sashal@kernel.org>
---
- drivers/irqchip/irq-realtek-rtl.c | 8 +++++---
+ drivers/irqchip/irq-realtek-rtl.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
-diff --git a/drivers/irqchip/irq-realtek-rtl.c b/drivers/irqchip/irq-realtek-rtl.c
-index d6788dd93c7bb..568614edd88f4 100644
--- a/drivers/irqchip/irq-realtek-rtl.c
+++ b/drivers/irqchip/irq-realtek-rtl.c
-@@ -95,7 +95,8 @@ static void realtek_irq_dispatch(struct irq_desc *desc)
+@@ -95,7 +95,8 @@ out:
* SoC interrupts are cascaded to MIPS CPU interrupts according to the
* interrupt-map in the device tree. Each SoC interrupt gets 4 bits for
* the CPU interrupt in an Interrupt Routing Register. Max 32 SoC interrupts
Signed-off-by: Sander Vanheule <sander@svanheule.net>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/4b4936606480265db47df152f00bc2ed46340599.1641739718.git.sander@svanheule.net
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+ Signed-off-by: Sasha Levin <sashal@kernel.org>
---
- drivers/irqchip/irq-realtek-rtl.c | 2 +-
+ drivers/irqchip/irq-realtek-rtl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/drivers/irqchip/irq-realtek-rtl.c b/drivers/irqchip/irq-realtek-rtl.c
-index fd9f275592d29..d6788dd93c7bb 100644
--- a/drivers/irqchip/irq-realtek-rtl.c
+++ b/drivers/irqchip/irq-realtek-rtl.c
-@@ -62,7 +62,7 @@ static struct irq_chip realtek_ictl_irq = {
+@@ -62,7 +62,7 @@ static struct irq_chip realtek_ictl_irq
static int intc_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hw)
{
--- /dev/null
- drivers/pci/controller/pcie-mt7621.c | 9 ---------
+From c035366d9c9fe48d947ee6c43465ab43d42e20f2 Mon Sep 17 00:00:00 2001
+From: Sergio Paracuellos <sergio.paracuellos@gmail.com>
+Date: Mon, 24 Jan 2022 12:30:03 +0100
+Subject: PCI: mt7621: Remove unused function pcie_rmw()
+
+From: Sergio Paracuellos <sergio.paracuellos@gmail.com>
+
+commit c035366d9c9fe48d947ee6c43465ab43d42e20f2 upstream.
+
+Function pcie_rmw() is not being used at all and can be deleted. Hence get
+rid of it, which fixes this warning:
+
+ drivers/pci/controller/pcie-mt7621.c:112:20: warning: unused function 'pcie_rmw' [-Wunused-function]
+
+Fixes: 2bdd5238e756 ("PCI: mt7621: Add MediaTek MT7621 PCIe host controller driver")
+Link: https://lore.kernel.org/r/20220124113003.406224-3-sergio.paracuellos@gmail.com
+Link: https://lore.kernel.org/all/202201241754.igtHzgHv-lkp@intel.com/
+Reported-by: kernel test robot <lkp@intel.com>
+Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
+Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
- diff --git a/drivers/pci/controller/pcie-mt7621.c b/drivers/pci/controller/pcie-mt7621.c
- index f2e567282d3e..33eb37a2225c 100644
++ drivers/pci/controller/pcie-mt7621.c | 9 ---------
+ 1 file changed, 9 deletions(-)
+
- @@ -109,15 +109,6 @@ static inline void pcie_write(struct mt7621_pcie *pcie, u32 val, u32 reg)
+--- a/drivers/pci/controller/pcie-mt7621.c
++++ b/drivers/pci/controller/pcie-mt7621.c
- --
- 2.35.1
-
++@@ -109,15 +109,6 @@ static inline void pcie_write(struct mt7
+ writel_relaxed(val, pcie->base + reg);
+ }
+
+-static inline void pcie_rmw(struct mt7621_pcie *pcie, u32 reg, u32 clr, u32 set)
+-{
+- u32 val = readl_relaxed(pcie->base + reg);
+-
+- val &= ~clr;
+- val |= set;
+- writel_relaxed(val, pcie->base + reg);
+-}
+-
+ static inline u32 pcie_port_read(struct mt7621_pcie_port *port, u32 reg)
+ {
+ return readl_relaxed(port->base + reg);
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20220124195808.2252071-1-namhyung@kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+ Signed-off-by: Sasha Levin <sashal@kernel.org>
---
- kernel/events/core.c | 11 +++++++++--
+ kernel/events/core.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
-diff --git a/kernel/events/core.c b/kernel/events/core.c
-index a0064dd706538..6ed890480c4aa 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
-@@ -2458,7 +2458,11 @@ static void perf_remove_from_context(struct perf_event *event, unsigned long fla
+@@ -2458,7 +2458,11 @@ static void perf_remove_from_context(str
* event_function_call() user.
*/
raw_spin_lock_irq(&ctx->lock);
net-bridge-vlan-fix-memory-leak-in-__allowed_ingress.patch
irqchip-realtek-rtl-map-control-data-to-virq.patch
irqchip-realtek-rtl-fix-off-by-one-in-routing.patch
+dt-bindings-can-tcan4x5x-fix-mram-cfg-rx-fifo-config.patch
+pci-mt7621-remove-unused-function-pcie_rmw.patch
perf-core-fix-cgroup-event-list-management.patch
-psi-fix-no-previous-prototype-warnings-when-config_c.patch
-psi-fix-defined-but-not-used-warnings-when-config_pr.patch
+psi-fix-no-previous-prototype-warnings-when-config_cgroups-n.patch
+psi-fix-defined-but-not-used-warnings-when-config_proc_fs-n.patch
+usb-dwc3-xilinx-fix-uninitialized-return-value.patch
+usr-include-makefile-add-linux-nfc.h-to-the-compile-test-coverage.patch
+ tools-testing-scatterlist-add-missing-defines.patch
--- /dev/null
- tools/testing/scatterlist/linux/mm.h | 3 ++-
+ From 08b6cb9abb05b1817400259cff0bb7d17f32807c Mon Sep 17 00:00:00 2001
+ From: Sasha Levin <sashal@kernel.org>
+ Date: Sat, 29 Jan 2022 13:41:07 -0800
+ Subject: tools/testing/scatterlist: add missing defines
+ MIME-Version: 1.0
+ Content-Type: text/plain; charset=UTF-8
+ Content-Transfer-Encoding: 8bit
+
+ From: Maor Gottlieb <maorg@nvidia.com>
+
+ [ Upstream commit 0226bd64da52aa23120d1450c37a424387827a21 ]
+
+ The cited commits replaced preemptible with pagefault_disabled and
+ flush_kernel_dcache_page with flush_dcache_page respectively, hence need
+ to update the corresponding defines in the test.
+
+ scatterlist.c: In function ‘sg_miter_stop’:
+ scatterlist.c:919:4: warning: implicit declaration of function ‘flush_dcache_page’ [-Wimplicit-function-declaration]
+ flush_dcache_page(miter->page);
+ ^~~~~~~~~~~~~~~~~
+ In file included from linux/scatterlist.h:8:0,
+ from scatterlist.c:9:
+ scatterlist.c:922:18: warning: implicit declaration of function ‘pagefault_disabled’ [-Wimplicit-function-declaration]
+ WARN_ON_ONCE(!pagefault_disabled());
+ ^
+ linux/mm.h:23:25: note: in definition of macro ‘WARN_ON_ONCE’
+ int __ret_warn_on = !!(condition); \
+ ^~~~~~~~~
+
+ Link: https://lkml.kernel.org/r/20220118082105.1737320-1-maorg@nvidia.com
+ Fixes: 723aca208516 ("mm/scatterlist: replace the !preemptible warning in sg_miter_stop()")
+ Fixes: 0e84f5dbf8d6 ("scatterlist: replace flush_kernel_dcache_page with flush_dcache_page")
+ Signed-off-by: Maor Gottlieb <maorg@nvidia.com>
+ Tested-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+ Cc: Thomas Gleixner <tglx@linutronix.de>
+ Cc: Christoph Hellwig <hch@lst.de>
+ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+ Signed-off-by: Sasha Levin <sashal@kernel.org>
++Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+ ---
-diff --git a/tools/testing/scatterlist/linux/mm.h b/tools/testing/scatterlist/linux/mm.h
-index 16ec895bbe5ff..5bd9e6e806254 100644
++ tools/testing/scatterlist/linux/mm.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
-@@ -74,7 +74,7 @@ static inline unsigned long page_to_phys(struct page *page)
+ --- a/tools/testing/scatterlist/linux/mm.h
+ +++ b/tools/testing/scatterlist/linux/mm.h
-@@ -127,6 +127,7 @@ kmalloc_array(unsigned int n, unsigned int size, unsigned int flags)
++@@ -74,7 +74,7 @@ static inline unsigned long page_to_phys
+ __UNIQUE_ID(min1_), __UNIQUE_ID(min2_), \
+ x, y)
+
+ -#define preemptible() (1)
+ +#define pagefault_disabled() (0)
+
+ static inline void *kmap(struct page *page)
+ {
---
-2.34.1
-
++@@ -127,6 +127,7 @@ kmalloc_array(unsigned int n, unsigned i
+ #define kmemleak_free(a)
+
+ #define PageSlab(p) (0)
+ +#define flush_dcache_page(p)
+
+ #define MAX_ERRNO 4095
+
projects / thirdparty / kernel / stable-queue.git / commitdiff
