kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/arch/arm64/include/asm/pgtable-types.h
..
..
@@ -1,20 +1,9 @@
1
+/* SPDX-License-Identifier: GPL-2.0-only */
1
2
 /*
2
3
  * Page table types definitions.
3
4
  *
4
5
  * Copyright (C) 2014 ARM Ltd.
5
6
  * Author: Catalin Marinas <catalin.marinas@arm.com>
6
- *
7
- * This program is free software: you can redistribute it and/or modify
8
- * it under the terms of the GNU General Public License version 2 as
9
- * published by the Free Software Foundation.
10
- *
11
- * This program is distributed in the hope that it will be useful,
12
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
- * GNU General Public License for more details.
15
- *
16
- * You should have received a copy of the GNU General Public License
17
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
18
7
  */
19
8
 
20
9
 #ifndef __ASM_PGTABLE_TYPES_H
..
..
@@ -25,6 +14,7 @@
25
14
 typedef u64 pteval_t;
26
15
 typedef u64 pmdval_t;
27
16
 typedef u64 pudval_t;
17
+typedef u64 p4dval_t;
28
18
 typedef u64 pgdval_t;
29
19
 
30
20
 /*
..
..
@@ -55,13 +45,11 @@
55
45
 #define __pgprot(x)	((pgprot_t) { (x) } )
56
46
 
57
47
 #if CONFIG_PGTABLE_LEVELS == 2
58
-#define __ARCH_USE_5LEVEL_HACK
59
48
 #include <asm-generic/pgtable-nopmd.h>
60
49
 #elif CONFIG_PGTABLE_LEVELS == 3
61
-#define __ARCH_USE_5LEVEL_HACK
62
50
 #include <asm-generic/pgtable-nopud.h>
63
51
 #elif CONFIG_PGTABLE_LEVELS == 4
64
-#include <asm-generic/5level-fixup.h>
52
+#include <asm-generic/pgtable-nop4d.h>
65
53
 #endif
66
54
 
67
55
 #endif	/* __ASM_PGTABLE_TYPES_H */