forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-31 f9004dbfff8a3fbbd7e2a88c8a4327c7f2f8e5b2
kernel/arch/x86/mm/Makefile
....@@ -7,29 +7,32 @@
77 KASAN_SANITIZE_mem_encrypt.o := n
88 KASAN_SANITIZE_mem_encrypt_identity.o := n
99
10
+# Disable KCSAN entirely, because otherwise we get warnings that some functions
11
+# reference __initdata sections.
12
+KCSAN_SANITIZE := n
13
+
1014 ifdef CONFIG_FUNCTION_TRACER
1115 CFLAGS_REMOVE_mem_encrypt.o = -pg
1216 CFLAGS_REMOVE_mem_encrypt_identity.o = -pg
1317 endif
1418
15
-obj-y := init.o init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \
16
- pat.o pgtable.o physaddr.o setup_nx.o tlb.o cpu_entry_area.o
19
+obj-y := init.o init_$(BITS).o fault.o ioremap.o extable.o mmap.o \
20
+ pgtable.o physaddr.o setup_nx.o tlb.o cpu_entry_area.o maccess.o
21
+
22
+obj-y += pat/
1723
1824 # Make sure __phys_addr has no stackprotector
19
-nostackp := $(call cc-option, -fno-stack-protector)
20
-CFLAGS_physaddr.o := $(nostackp)
21
-CFLAGS_setup_nx.o := $(nostackp)
22
-CFLAGS_mem_encrypt_identity.o := $(nostackp)
25
+CFLAGS_physaddr.o := -fno-stack-protector
26
+CFLAGS_setup_nx.o := -fno-stack-protector
27
+CFLAGS_mem_encrypt_identity.o := -fno-stack-protector
2328
24
-CFLAGS_fault.o := -I$(src)/../include/asm/trace
25
-
26
-obj-$(CONFIG_X86_PAT) += pat_rbtree.o
29
+CFLAGS_fault.o := -I $(srctree)/$(src)/../include/asm/trace
2730
2831 obj-$(CONFIG_X86_32) += pgtable_32.o iomap_32.o
2932
3033 obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
31
-obj-$(CONFIG_X86_PTDUMP_CORE) += dump_pagetables.o
32
-obj-$(CONFIG_X86_PTDUMP) += debug_pagetables.o
34
+obj-$(CONFIG_PTDUMP_CORE) += dump_pagetables.o
35
+obj-$(CONFIG_PTDUMP_DEBUGFS) += debug_pagetables.o
3336
3437 obj-$(CONFIG_HIGHMEM) += highmem_32.o
3538
....@@ -45,7 +48,6 @@
4548 obj-$(CONFIG_ACPI_NUMA) += srat.o
4649 obj-$(CONFIG_NUMA_EMU) += numa_emulation.o
4750
48
-obj-$(CONFIG_X86_INTEL_MPX) += mpx.o
4951 obj-$(CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS) += pkeys.o
5052 obj-$(CONFIG_RANDOMIZE_MEMORY) += kaslr.o
5153 obj-$(CONFIG_PAGE_TABLE_ISOLATION) += pti.o