kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/arch/riscv/include/asm/processor.h
..
..
@@ -1,20 +1,14 @@
1
+/* SPDX-License-Identifier: GPL-2.0-only */
1
2
 /*
2
3
  * Copyright (C) 2012 Regents of the University of California
3
- *
4
- *   This program is free software; you can redistribute it and/or
5
- *   modify it under the terms of the GNU General Public License
6
- *   as published by the Free Software Foundation, version 2.
7
- *
8
- *   This program is distributed in the hope that it will be useful,
9
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
10
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
- *   GNU General Public License for more details.
12
4
  */
13
5
 
14
6
 #ifndef _ASM_RISCV_PROCESSOR_H
15
7
 #define _ASM_RISCV_PROCESSOR_H
16
8
 
17
9
 #include <linux/const.h>
10
+
11
+#include <vdso/processor.h>
18
12
 
19
13
 #include <asm/ptrace.h>
20
14
 
..
..
@@ -33,12 +27,6 @@
33
27
 struct task_struct;
34
28
 struct pt_regs;
35
29
 
36
-/*
37
- * Default implementation of macro that returns current
38
- * instruction pointer ("program counter").
39
- */
40
-#define current_text_addr()	({ __label__ _l; _l: &&_l; })
41
-
42
30
 /* CPU-specific state of a task */
43
31
 struct thread_struct {
44
32
 	/* Callee-saved registers */
..
..
@@ -56,7 +44,7 @@
56
44
 	((struct pt_regs *)(task_stack_page(tsk) + THREAD_SIZE		\
57
45
 			    - ALIGN(sizeof(struct pt_regs), STACK_ALIGN)))
58
46
 
59
-#define KSTK_EIP(tsk)		(task_pt_regs(tsk)->sepc)
47
+#define KSTK_EIP(tsk)		(task_pt_regs(tsk)->epc)
60
48
 #define KSTK_ESP(tsk)		(task_pt_regs(tsk)->sp)
61
49
 
62
50
 
..
..
@@ -72,23 +60,14 @@
72
60
 extern unsigned long get_wchan(struct task_struct *p);
73
61
 
74
62
 
75
-static inline void cpu_relax(void)
76
-{
77
-#ifdef __riscv_muldiv
78
-	int dummy;
79
-	/* In lieu of a halt instruction, induce a long-latency stall. */
80
-	__asm__ __volatile__ ("div %0, %0, zero" : "=r" (dummy));
81
-#endif
82
-	barrier();
83
-}
84
-
85
63
 static inline void wait_for_interrupt(void)
86
64
 {
87
65
 	__asm__ __volatile__ ("wfi");
88
66
 }
89
67
 
90
68
 struct device_node;
91
-extern int riscv_of_processor_hart(struct device_node *node);
69
+int riscv_of_processor_hartid(struct device_node *node);
70
+int riscv_of_parent_hartid(struct device_node *node);
92
71
 
93
72
 extern void riscv_fill_hwcap(void);
94
73