Commit e963d685 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'xtensa-20220626' of https://github.com/jcmvbkbc/linux-xtensa

Pull xtensa fixes from Max Filippov:

 - fix OF reference leaks in xtensa arch code

 - replace '.bss' with '.section .bss' to fix entry.S build with old
   assembler

* tag 'xtensa-20220626' of https://github.com/jcmvbkbc/linux-xtensa:
  xtensa: change '.bss' to '.section .bss'
  xtensa: xtfpga: Fix refcount leak bug in setup
  xtensa: Fix refcount leak bug in time.c
parents 8100775d a2d9b75b
...@@ -2173,7 +2173,7 @@ ENDPROC(ret_from_kernel_thread) ...@@ -2173,7 +2173,7 @@ ENDPROC(ret_from_kernel_thread)
#ifdef CONFIG_HIBERNATION #ifdef CONFIG_HIBERNATION
.bss .section .bss, "aw"
.align 4 .align 4
.Lsaved_regs: .Lsaved_regs:
#if defined(__XTENSA_WINDOWED_ABI__) #if defined(__XTENSA_WINDOWED_ABI__)
......
...@@ -154,6 +154,7 @@ static void __init calibrate_ccount(void) ...@@ -154,6 +154,7 @@ static void __init calibrate_ccount(void)
cpu = of_find_compatible_node(NULL, NULL, "cdns,xtensa-cpu"); cpu = of_find_compatible_node(NULL, NULL, "cdns,xtensa-cpu");
if (cpu) { if (cpu) {
clk = of_clk_get(cpu, 0); clk = of_clk_get(cpu, 0);
of_node_put(cpu);
if (!IS_ERR(clk)) { if (!IS_ERR(clk)) {
ccount_freq = clk_get_rate(clk); ccount_freq = clk_get_rate(clk);
return; return;
......
...@@ -133,6 +133,7 @@ static int __init machine_setup(void) ...@@ -133,6 +133,7 @@ static int __init machine_setup(void)
if ((eth = of_find_compatible_node(eth, NULL, "opencores,ethoc"))) if ((eth = of_find_compatible_node(eth, NULL, "opencores,ethoc")))
update_local_mac(eth); update_local_mac(eth);
of_node_put(eth);
return 0; return 0;
} }
arch_initcall(machine_setup); arch_initcall(machine_setup);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment