aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/mm/book3s64/hash_utils.c
diff options
context:
space:
mode:
authorGravatar Michael Ellerman <mpe@ellerman.id.au> 2023-02-12 22:11:56 +1100
committerGravatar Michael Ellerman <mpe@ellerman.id.au> 2023-02-12 22:11:56 +1100
commitfc8a898cfdbb0e63cfde547715c2031de22e7893 (patch)
treee1eaae008d673bb68cdc003d72eadc4ba5535a18 /arch/powerpc/mm/book3s64/hash_utils.c
parentpowerpc/ps3: Refresh ps3_defconfig (diff)
parentpowerpc/64s/interrupt: Fix interrupt exit race with security mitigation switch (diff)
downloadlinux-fc8a898cfdbb0e63cfde547715c2031de22e7893.tar.gz
linux-fc8a898cfdbb0e63cfde547715c2031de22e7893.tar.bz2
linux-fc8a898cfdbb0e63cfde547715c2031de22e7893.zip
Merge branch 'fixes' into next
Merge our fixes branch to bring in some changes that conflict with upcoming next content.
Diffstat (limited to 'arch/powerpc/mm/book3s64/hash_utils.c')
-rw-r--r--arch/powerpc/mm/book3s64/hash_utils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/book3s64/hash_utils.c b/arch/powerpc/mm/book3s64/hash_utils.c
index fa1c148e1f50..fedffe3ae136 100644
--- a/arch/powerpc/mm/book3s64/hash_utils.c
+++ b/arch/powerpc/mm/book3s64/hash_utils.c
@@ -1012,7 +1012,7 @@ static void __init hash_init_partition_table(phys_addr_t hash_table,
void hpt_clear_stress(void);
static struct timer_list stress_hpt_timer;
-void stress_hpt_timer_fn(struct timer_list *timer)
+static void stress_hpt_timer_fn(struct timer_list *timer)
{
int next_cpu;