Skip to content

Commit e963d68

Browse files
committed
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
2 parents 8100775 + a2d9b75 commit e963d68

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

arch/xtensa/kernel/entry.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2173,7 +2173,7 @@ ENDPROC(ret_from_kernel_thread)
21732173

21742174
#ifdef CONFIG_HIBERNATION
21752175

2176-
.bss
2176+
.section .bss, "aw"
21772177
.align 4
21782178
.Lsaved_regs:
21792179
#if defined(__XTENSA_WINDOWED_ABI__)

arch/xtensa/kernel/time.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ static void __init calibrate_ccount(void)
154154
cpu = of_find_compatible_node(NULL, NULL, "cdns,xtensa-cpu");
155155
if (cpu) {
156156
clk = of_clk_get(cpu, 0);
157+
of_node_put(cpu);
157158
if (!IS_ERR(clk)) {
158159
ccount_freq = clk_get_rate(clk);
159160
return;

arch/xtensa/platforms/xtfpga/setup.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ static int __init machine_setup(void)
133133

134134
if ((eth = of_find_compatible_node(eth, NULL, "opencores,ethoc")))
135135
update_local_mac(eth);
136+
of_node_put(eth);
136137
return 0;
137138
}
138139
arch_initcall(machine_setup);

0 commit comments

Comments
 (0)