diff options
author | Richard Braun <rbraun@sceen.net> | 2013-07-09 20:53:31 +0200 |
---|---|---|
committer | Richard Braun <rbraun@sceen.net> | 2013-07-09 20:54:24 +0200 |
commit | d485f7e4480e06003095d0f94e022dfca3c84a0d (patch) | |
tree | 6d754241ad8c180220caa83d29a86e3ce652425c /arch/x86/machine/param.h | |
parent | 38dad0326a0c22676e64d757223df6f97f19eac0 (diff) |
vm/vm_phys: merge into the vm_page module
The original idea was to separate physical page allocation from page list
management, but it doesn't make much sense any more.
Diffstat (limited to 'arch/x86/machine/param.h')
-rw-r--r-- | arch/x86/machine/param.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/arch/x86/machine/param.h b/arch/x86/machine/param.h index e7612441..5ed5d461 100644 --- a/arch/x86/machine/param.h +++ b/arch/x86/machine/param.h @@ -132,35 +132,35 @@ */ #ifdef __LP64__ -#define VM_MAX_PHYS_SEG 2 -#define VM_PHYS_NORMAL_LIMIT DECL_CONST(0x100000000, UL) -#define VM_PHYS_HIGHMEM_LIMIT DECL_CONST(0x10000000000000, UL) +#define VM_PAGE_MAX_SEGS 2 +#define VM_PAGE_NORMAL_LIMIT DECL_CONST(0x100000000, UL) +#define VM_PAGE_HIGHMEM_LIMIT DECL_CONST(0x10000000000000, UL) #else /* __LP64__ */ #ifdef X86_PAE -#define VM_MAX_PHYS_SEG 2 -#define VM_PHYS_NORMAL_LIMIT DECL_CONST(0x100000000, ULL) -#define VM_PHYS_HIGHMEM_LIMIT DECL_CONST(0x10000000000000, ULL) +#define VM_PAGE_MAX_SEGS 2 +#define VM_PAGE_NORMAL_LIMIT DECL_CONST(0x100000000, ULL) +#define VM_PAGE_HIGHMEM_LIMIT DECL_CONST(0x10000000000000, ULL) #else /* X86_PAE */ -#define VM_MAX_PHYS_SEG 1 -#define VM_PHYS_NORMAL_LIMIT DECL_CONST(0xfffff000, UL) +#define VM_PAGE_MAX_SEGS 1 +#define VM_PAGE_NORMAL_LIMIT DECL_CONST(0xfffff000, UL) #endif /* X86_PAE */ #endif /* __LP64__ */ /* * Physical segment indexes. */ -#define VM_PHYS_SEG_NORMAL 0 -#define VM_PHYS_SEG_HIGHMEM 1 +#define VM_PAGE_SEG_NORMAL 0 +#define VM_PAGE_SEG_HIGHMEM 1 /* * Number of physical segment lists. */ -#define VM_NR_PHYS_SEGLIST VM_MAX_PHYS_SEG +#define VM_PAGE_NR_SEGLISTS VM_PAGE_MAX_SEGS /* * Segment list priorities. */ -#define VM_PHYS_SEGLIST_NORMAL 0 -#define VM_PHYS_SEGLIST_HIGHMEM 1 +#define VM_PAGE_SEGLIST_NORMAL 0 +#define VM_PAGE_SEGLIST_HIGHMEM 1 #endif /* _X86_PARAM_H */ |