| From: Andrew Morton <akpm@linux-foundation.org> |
| Subject: linux-next-rejects |
| |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| arch/x86/mm/Makefile | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| --- a/arch/x86/mm/Makefile~linux-next-rejects |
| +++ a/arch/x86/mm/Makefile |
| @@ -20,13 +20,12 @@ CFLAGS_REMOVE_mem_encrypt_identity.o = - |
| endif |
| |
| obj-y := init.o init_$(BITS).o fault.o ioremap.o extable.o mmap.o \ |
| - pgtable.o physaddr.o setup_nx.o tlb.o cpu_entry_area.o maccess.o pgprot.o |
| + pgtable.o physaddr.o tlb.o cpu_entry_area.o maccess.o pgprot.o |
| |
| obj-y += pat/ |
| |
| # Make sure __phys_addr has no stackprotector |
| CFLAGS_physaddr.o := -fno-stack-protector |
| -CFLAGS_setup_nx.o := -fno-stack-protector |
| CFLAGS_mem_encrypt_identity.o := -fno-stack-protector |
| |
| CFLAGS_fault.o := -I $(srctree)/$(src)/../include/asm/trace |
| _ |
