add ax88772_rst

hc

2024-05-10 9999e48639b3cecb08ffb37358bcba3b48161b29

 kernel/arch/x86/mm/mmio-mod.c
..
..
@@ -1,17 +1,5 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
- * This program is free software; you can redistribute it and/or modify
3
- * it under the terms of the GNU General Public License as published by
4
- * the Free Software Foundation; either version 2 of the License, or
5
- * (at your option) any later version.
6
- *
7
- * This program is distributed in the hope that it will be useful,
8
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
9
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
10
- * GNU General Public License for more details.
11
- *
12
- * You should have received a copy of the GNU General Public License
13
- * along with this program; if not, write to the Free Software
14
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
15
3
  *
16
4
  * Copyright (C) IBM Corporation, 2005
17
5
  *               Jeff Muizelaar, 2006, 2007
..
..
@@ -29,8 +17,8 @@
29
17
 #include <linux/slab.h>
30
18
 #include <linux/uaccess.h>
31
19
 #include <linux/io.h>
32
-#include <asm/pgtable.h>
33
20
 #include <linux/mmiotrace.h>
21
+#include <linux/pgtable.h>
34
22
 #include <asm/e820/api.h> /* for ISA_START_ADDRESS */
35
23
 #include <linux/atomic.h>
36
24
 #include <linux/percpu.h>
..
..
@@ -398,7 +386,7 @@
398
386
 	put_online_cpus();
399
387
 
400
388
 	for_each_cpu(cpu, downed_cpus) {
401
-		err = cpu_down(cpu);
389
+		err = remove_cpu(cpu);
402
390
 		if (!err)
403
391
 			pr_info("CPU%d is down.\n", cpu);
404
392
 		else
..
..
@@ -406,7 +394,7 @@
406
394
 	}
407
395
 out:
408
396
 	if (num_online_cpus() > 1)
409
-		pr_warning("multiple CPUs still online, may miss events.\n");
397
+		pr_warn("multiple CPUs still online, may miss events.\n");
410
398
 }
411
399
 
412
400
 static void leave_uniprocessor(void)
..
..
@@ -418,7 +406,7 @@
418
406
 		return;
419
407
 	pr_notice("Re-enabling CPUs...\n");
420
408
 	for_each_cpu(cpu, downed_cpus) {
421
-		err = cpu_up(cpu);
409
+		err = add_cpu(cpu);
422
410
 		if (!err)
423
411
 			pr_info("enabled CPU%d.\n", cpu);
424
412
 		else
..
..
@@ -430,8 +418,8 @@
430
418
 static void enter_uniprocessor(void)
431
419
 {
432
420
 	if (num_online_cpus() > 1)
433
-		pr_warning("multiple CPUs are online, may miss events. "
434
-			   "Suggest booting with maxcpus=1 kernel argument.\n");
421
+		pr_warn("multiple CPUs are online, may miss events. "
422
+			"Suggest booting with maxcpus=1 kernel argument.\n");
435
423
 }
436
424
 
437
425
 static void leave_uniprocessor(void)