Skip to content

Commit 657a292

Browse files
linuswRussell King (Oracle)
authored andcommitted
ARM: 9408/1: mm: CFI: Fix some erroneous reset prototypes
I somehow got a few cpu_nn_reset() signatures wrong in my patch. Fix it up. Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/ Fixes: 393999f ("ARM: 9389/2: mm: Define prototypes for all per-processor calls") Reported-by: kernel test robot <[email protected]> Reported-by: Nathan Chancellor <[email protected]> Reviewed-by: Sami Tolvanen <[email protected]> Signed-off-by: Linus Walleij <[email protected]> Signed-off-by: Russell King (Oracle) <[email protected]>
1 parent 4e7b4ff commit 657a292

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

arch/arm/mm/proc.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ void cpu_arm7tdmi_proc_init(void);
1717
__ADDRESSABLE(cpu_arm7tdmi_proc_init);
1818
void cpu_arm7tdmi_proc_fin(void);
1919
__ADDRESSABLE(cpu_arm7tdmi_proc_fin);
20-
void cpu_arm7tdmi_reset(void);
20+
void cpu_arm7tdmi_reset(unsigned long addr, bool hvc);
2121
__ADDRESSABLE(cpu_arm7tdmi_reset);
2222
int cpu_arm7tdmi_do_idle(void);
2323
__ADDRESSABLE(cpu_arm7tdmi_do_idle);
@@ -32,7 +32,7 @@ void cpu_arm720_proc_init(void);
3232
__ADDRESSABLE(cpu_arm720_proc_init);
3333
void cpu_arm720_proc_fin(void);
3434
__ADDRESSABLE(cpu_arm720_proc_fin);
35-
void cpu_arm720_reset(void);
35+
void cpu_arm720_reset(unsigned long addr, bool hvc);
3636
__ADDRESSABLE(cpu_arm720_reset);
3737
int cpu_arm720_do_idle(void);
3838
__ADDRESSABLE(cpu_arm720_do_idle);
@@ -49,7 +49,7 @@ void cpu_arm740_proc_init(void);
4949
__ADDRESSABLE(cpu_arm740_proc_init);
5050
void cpu_arm740_proc_fin(void);
5151
__ADDRESSABLE(cpu_arm740_proc_fin);
52-
void cpu_arm740_reset(void);
52+
void cpu_arm740_reset(unsigned long addr, bool hvc);
5353
__ADDRESSABLE(cpu_arm740_reset);
5454
int cpu_arm740_do_idle(void);
5555
__ADDRESSABLE(cpu_arm740_do_idle);
@@ -64,7 +64,7 @@ void cpu_arm9tdmi_proc_init(void);
6464
__ADDRESSABLE(cpu_arm9tdmi_proc_init);
6565
void cpu_arm9tdmi_proc_fin(void);
6666
__ADDRESSABLE(cpu_arm9tdmi_proc_fin);
67-
void cpu_arm9tdmi_reset(void);
67+
void cpu_arm9tdmi_reset(unsigned long addr, bool hvc);
6868
__ADDRESSABLE(cpu_arm9tdmi_reset);
6969
int cpu_arm9tdmi_do_idle(void);
7070
__ADDRESSABLE(cpu_arm9tdmi_do_idle);
@@ -79,7 +79,7 @@ void cpu_arm920_proc_init(void);
7979
__ADDRESSABLE(cpu_arm920_proc_init);
8080
void cpu_arm920_proc_fin(void);
8181
__ADDRESSABLE(cpu_arm920_proc_fin);
82-
void cpu_arm920_reset(void);
82+
void cpu_arm920_reset(unsigned long addr, bool hvc);
8383
__ADDRESSABLE(cpu_arm920_reset);
8484
int cpu_arm920_do_idle(void);
8585
__ADDRESSABLE(cpu_arm920_do_idle);
@@ -102,7 +102,7 @@ void cpu_arm922_proc_init(void);
102102
__ADDRESSABLE(cpu_arm922_proc_init);
103103
void cpu_arm922_proc_fin(void);
104104
__ADDRESSABLE(cpu_arm922_proc_fin);
105-
void cpu_arm922_reset(void);
105+
void cpu_arm922_reset(unsigned long addr, bool hvc);
106106
__ADDRESSABLE(cpu_arm922_reset);
107107
int cpu_arm922_do_idle(void);
108108
__ADDRESSABLE(cpu_arm922_do_idle);
@@ -119,7 +119,7 @@ void cpu_arm925_proc_init(void);
119119
__ADDRESSABLE(cpu_arm925_proc_init);
120120
void cpu_arm925_proc_fin(void);
121121
__ADDRESSABLE(cpu_arm925_proc_fin);
122-
void cpu_arm925_reset(void);
122+
void cpu_arm925_reset(unsigned long addr, bool hvc);
123123
__ADDRESSABLE(cpu_arm925_reset);
124124
int cpu_arm925_do_idle(void);
125125
__ADDRESSABLE(cpu_arm925_do_idle);
@@ -159,7 +159,7 @@ void cpu_arm940_proc_init(void);
159159
__ADDRESSABLE(cpu_arm940_proc_init);
160160
void cpu_arm940_proc_fin(void);
161161
__ADDRESSABLE(cpu_arm940_proc_fin);
162-
void cpu_arm940_reset(void);
162+
void cpu_arm940_reset(unsigned long addr, bool hvc);
163163
__ADDRESSABLE(cpu_arm940_reset);
164164
int cpu_arm940_do_idle(void);
165165
__ADDRESSABLE(cpu_arm940_do_idle);
@@ -174,7 +174,7 @@ void cpu_arm946_proc_init(void);
174174
__ADDRESSABLE(cpu_arm946_proc_init);
175175
void cpu_arm946_proc_fin(void);
176176
__ADDRESSABLE(cpu_arm946_proc_fin);
177-
void cpu_arm946_reset(void);
177+
void cpu_arm946_reset(unsigned long addr, bool hvc);
178178
__ADDRESSABLE(cpu_arm946_reset);
179179
int cpu_arm946_do_idle(void);
180180
__ADDRESSABLE(cpu_arm946_do_idle);
@@ -429,7 +429,7 @@ void cpu_v7_proc_init(void);
429429
__ADDRESSABLE(cpu_v7_proc_init);
430430
void cpu_v7_proc_fin(void);
431431
__ADDRESSABLE(cpu_v7_proc_fin);
432-
void cpu_v7_reset(void);
432+
void cpu_v7_reset(unsigned long addr, bool hvc);
433433
__ADDRESSABLE(cpu_v7_reset);
434434
int cpu_v7_do_idle(void);
435435
__ADDRESSABLE(cpu_v7_do_idle);

0 commit comments

Comments
 (0)