1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
index 9b5a9f59a478..06630d26e56d 100644
--- a/arch/x86/mm/Makefile
+++ b/arch/x86/mm/Makefile
@@ -1,9 +1,10 @@
 obj-y   :=  init.o init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \
-            pat.o pgtable.o physaddr.o gup.o
+            pat.o pgtable.o physaddr.o gup.o setup_nx.o
 # Make sure __phys_addr has no stackprotector
 nostackp := $(call cc-option, -fno-stack-protector)
 CFLAGS_physaddr.o               := $(nostackp)
+CFLAGS_setup_nx.o               := $(nostackp)
 obj-$(CONFIG_SMP)               += tlb.o

diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile index 9b5a9f59a478..06630d26e56d 100644 --- a/arch/x86/mm/Makefile +++ b/arch/x86/mm/Makefile
@@ -1,9 +1,10 @@
1	obj-y := init.o init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \	1	obj-y := init.o init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \
2	pat.o pgtable.o physaddr.o gup.o	2	pat.o pgtable.o physaddr.o gup.o setup_nx.o
3		3
4	# Make sure __phys_addr has no stackprotector	4	# Make sure __phys_addr has no stackprotector
5	nostackp := $(call cc-option, -fno-stack-protector)	5	nostackp := $(call cc-option, -fno-stack-protector)
6	CFLAGS_physaddr.o := $(nostackp)	6	CFLAGS_physaddr.o := $(nostackp)
		7	CFLAGS_setup_nx.o := $(nostackp)
7		8
8	obj-$(CONFIG_SMP) += tlb.o	9	obj-$(CONFIG_SMP) += tlb.o
9		10