Commit f9b57cf8 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/mm/pat: Move the memtype related files to arch/x86/mm/pat/ 



- pat.c offers, dominantly, the memtype APIs - so rename it to memtype.c.

- pageattr.c is offering, primarily, the set_memory*() page attribute APIs,
  which is offered via the <asm/set_memory.h> header: name the .c file
  along the same pattern.

I.e. perform these renames, and move them all next to each other in arch/x86/mm/pat/:

    pat.c             => memtype.c
    pat_internal.h    => memtype.h
    pat_interval.c    => memtype_interval.c

    pageattr.c        => set_memory.c
    pageattr-test.c   => cpa-test.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent d891b921

arch/x86/mm/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -12,8 +12,10 @@ CFLAGS_REMOVE_mem_encrypt.o = -pg 
CFLAGS_REMOVE_mem_encrypt_identity.o	= -pg

endif



obj-y	:=  init.o init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \

	    pat.o pgtable.o physaddr.o setup_nx.o tlb.o cpu_entry_area.o maccess.o

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



obj-y				+= pat/



# Make sure __phys_addr has no stackprotector

nostackp := $(call cc-option, -fno-stack-protector)
@@ -23,8 +25,6 @@ CFLAGS_mem_encrypt_identity.o := $(nostackp) 


CFLAGS_fault.o := -I $(srctree)/$(src)/../include/asm/trace



obj-$(CONFIG_X86_PAT)		+= pat_interval.o



obj-$(CONFIG_X86_32)		+= pgtable_32.o iomap_32.o



obj-$(CONFIG_HUGETLB_PAGE)	+= hugetlbpage.o

arch/x86/mm/pat/Makefile

0 → 100644
+5 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



obj-y				:= set_memory.o memtype.o



obj-$(CONFIG_X86_PAT)		+= memtype_interval.o

arch/x86/mm/pat.c→arch/x86/mm/pat/memtype.c

+2 −2
Original line number Diff line number Diff line
@@ -55,8 +55,8 @@ 
#include <asm/pat.h>

#include <asm/io.h>



#include "pat_internal.h"

#include "mm_internal.h"

#include "memtype.h"

#include "../mm_internal.h"



#undef pr_fmt

#define pr_fmt(fmt) "" fmt

arch/x86/mm/pat_internal.h→arch/x86/mm/pat/memtype.h

+3 −3
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __PAT_INTERNAL_H_

#define __PAT_INTERNAL_H_

#ifndef __MEMTYPE_H_

#define __MEMTYPE_H_



extern int pat_debug_enable;
@@ -46,4 +46,4 @@ static inline int memtype_copy_nth_element(struct memtype *out, loff_t pos) 
{ return 0; }

#endif



#endif /* __PAT_INTERNAL_H_ */
 
#endif /* __MEMTYPE_H_ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE