From: Kevin Hao <kexin....@windriver.com>

The stable commit 01946c3c83b2 ("soc: xilinx: Fix for call trace due to
the usage of smp_processor_id()") is trying to fix a call trace in the
xlnx_event_init_sgi(), but that issue has already been fixed by a local
commit 3eea40ee0991 ("driver: soc: xilinx: rename cpu_number1 to
dummy_cpu_number"). Compare to the changes in the stable commit, our
local commit is more reasonable. So revert the change of stable commit.

Signed-off-by: Kevin Hao <kexin....@windriver.com>
---
Hi Bruce,

Please merge this onto the following branch.
  v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc

 drivers/soc/xilinx/xlnx_event_manager.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/soc/xilinx/xlnx_event_manager.c 
b/drivers/soc/xilinx/xlnx_event_manager.c
index 4b26a29bcabb..9156cb45bd53 100644
--- a/drivers/soc/xilinx/xlnx_event_manager.c
+++ b/drivers/soc/xilinx/xlnx_event_manager.c
@@ -569,7 +569,6 @@ static void xlnx_disable_percpu_irq(void *data)
 static int xlnx_event_init_sgi(struct platform_device *pdev)
 {
        int ret = 0;
-       int cpu;
        /*
         * IRQ related structures are used for the following:
         * for each SGI interrupt ensure its mapped by GIC IRQ domain
@@ -606,11 +605,8 @@ static int xlnx_event_init_sgi(struct platform_device 
*pdev)
        sgi_fwspec.param[0] = sgi_num;
        virq_sgi = irq_create_fwspec_mapping(&sgi_fwspec);
 
-       cpu = get_cpu();
-       per_cpu(cpu_number1, cpu) = cpu;
        ret = request_percpu_irq(virq_sgi, xlnx_event_handler, 
"xlnx_event_mgmt",
-                                &cpu_number1);
-       put_cpu();
+                                &dummy_cpu_number);
 
        WARN_ON(ret);
        if (ret) {
-- 
2.40.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13569): 
https://lists.yoctoproject.org/g/linux-yocto/message/13569
Mute This Topic: https://lists.yoctoproject.org/mt/104389298/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to