diff options
Diffstat (limited to 'target/linux/generic/backport-6.6/310-v6.7-mips-kexec-fix-the-incorrect-ifdeffery-and-dependenc.patch')
| -rw-r--r-- | target/linux/generic/backport-6.6/310-v6.7-mips-kexec-fix-the-incorrect-ifdeffery-and-dependenc.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/target/linux/generic/backport-6.6/310-v6.7-mips-kexec-fix-the-incorrect-ifdeffery-and-dependenc.patch b/target/linux/generic/backport-6.6/310-v6.7-mips-kexec-fix-the-incorrect-ifdeffery-and-dependenc.patch index 99a6bfe638..6d3c7d04fe 100644 --- a/target/linux/generic/backport-6.6/310-v6.7-mips-kexec-fix-the-incorrect-ifdeffery-and-dependenc.patch +++ b/target/linux/generic/backport-6.6/310-v6.7-mips-kexec-fix-the-incorrect-ifdeffery-and-dependenc.patch @@ -134,7 +134,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> }; --- a/arch/mips/kernel/smp-cps.c +++ b/arch/mips/kernel/smp-cps.c -@@ -392,7 +392,7 @@ static void cps_smp_finish(void) +@@ -395,7 +395,7 @@ static void cps_smp_finish(void) local_irq_enable(); } @@ -143,7 +143,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> enum cpu_death { CPU_DEATH_HALT, -@@ -429,7 +429,7 @@ static void cps_shutdown_this_cpu(enum c +@@ -432,7 +432,7 @@ static void cps_shutdown_this_cpu(enum c } } @@ -152,7 +152,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> static void cps_kexec_nonboot_cpu(void) { -@@ -439,9 +439,9 @@ static void cps_kexec_nonboot_cpu(void) +@@ -442,9 +442,9 @@ static void cps_kexec_nonboot_cpu(void) cps_shutdown_this_cpu(CPU_DEATH_POWER); } @@ -164,7 +164,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> #ifdef CONFIG_HOTPLUG_CPU -@@ -610,7 +610,7 @@ static const struct plat_smp_ops cps_smp +@@ -613,7 +613,7 @@ static const struct plat_smp_ops cps_smp .cpu_die = cps_cpu_die, .cleanup_dead_cpu = cps_cleanup_dead_cpu, #endif @@ -175,8 +175,8 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> }; --- a/arch/mips/loongson64/reset.c +++ b/arch/mips/loongson64/reset.c -@@ -53,7 +53,7 @@ static void loongson_halt(void) - } +@@ -39,7 +39,7 @@ static int firmware_poweroff(struct sys_ + return NOTIFY_DONE; } -#ifdef CONFIG_KEXEC @@ -184,9 +184,9 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> /* 0X80000000~0X80200000 is safe */ #define MAX_ARGS 64 -@@ -158,7 +158,7 @@ static int __init mips_reboot_setup(void - _machine_halt = loongson_halt; - pm_power_off = loongson_poweroff; +@@ -152,7 +152,7 @@ static int __init mips_reboot_setup(void + firmware_poweroff, NULL); + } -#ifdef CONFIG_KEXEC +#ifdef CONFIG_KEXEC_CORE @@ -195,7 +195,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> return -ENOMEM; --- a/arch/mips/loongson64/smp.c +++ b/arch/mips/loongson64/smp.c -@@ -864,7 +864,7 @@ const struct plat_smp_ops loongson3_smp_ +@@ -883,7 +883,7 @@ const struct plat_smp_ops loongson3_smp_ .cpu_disable = loongson3_cpu_disable, .cpu_die = loongson3_cpu_die, #endif |