===== arch/ia64/Kconfig 1.79 vs edited ===== --- 1.79/arch/ia64/Kconfig 2004-08-15 12:45:18 -07:00 +++ edited/arch/ia64/Kconfig 2004-09-08 14:11:59 -07:00 @@ -46,8 +46,6 @@ bool "generic" select NUMA select ACPI_NUMA - select VIRTUAL_MEM_MAP - select DISCONTIGMEM help This selects the system type of your hardware. A "generic" kernel will run on any supported IA-64 system. However, if you configure @@ -158,25 +156,9 @@ Access). This option is for configuring high-end multiprocessor server systems. If in doubt, say N. -config VIRTUAL_MEM_MAP - bool "Virtual mem map" - default y if !IA64_HP_SIM - help - Say Y to compile the kernel with support for a virtual mem map. - This code also only takes effect if a memory hole of greater than - 1 Gb is found during boot. You must turn this option on if you - require the DISCONTIGMEM option for your machine. If you are - unsure, say Y. - config DISCONTIGMEM - bool "Discontiguous memory support" - depends on (IA64_DIG || IA64_SGI_SN2 || IA64_GENERIC || IA64_HP_ZX1) && NUMA && VIRTUAL_MEM_MAP - default y if (IA64_SGI_SN2 || IA64_GENERIC) && NUMA - help - Say Y to support efficient handling of discontiguous physical memory, - for architectures which are either NUMA (Non-Uniform Memory Access) - or have huge holes in the physical address space for other reasons. - See for more. + bool + default y config IA64_CYCLONE bool "Cyclone (EXA) Time Source support" ===== arch/ia64/mm/Makefile 1.8 vs edited ===== --- 1.8/arch/ia64/mm/Makefile 2003-09-22 18:50:15 -07:00 +++ edited/arch/ia64/mm/Makefile 2004-09-08 14:08:25 -07:00 @@ -7,6 +7,3 @@ obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o obj-$(CONFIG_NUMA) += numa.o obj-$(CONFIG_DISCONTIGMEM) += discontig.o -ifndef CONFIG_DISCONTIGMEM -obj-y += contig.o -endif ===== arch/ia64/mm/fault.c 1.20 vs edited ===== --- 1.20/arch/ia64/mm/fault.c 2004-09-07 23:32:57 -07:00 +++ edited/arch/ia64/mm/fault.c 2004-09-08 14:12:35 -07:00 @@ -85,7 +85,6 @@ if (in_atomic() || !mm) goto no_context; -#ifdef CONFIG_VIRTUAL_MEM_MAP /* * If fault is in region 5 and we are in the kernel, we may already * have the mmap_sem (pfn_valid macro is called during mmap). There @@ -95,7 +94,6 @@ if ((REGION_NUMBER(address) == 5) && !user_mode(regs)) goto bad_area_no_up; -#endif down_read(&mm->mmap_sem); @@ -178,9 +176,8 @@ bad_area: up_read(&mm->mmap_sem); -#ifdef CONFIG_VIRTUAL_MEM_MAP + bad_area_no_up: -#endif if ((isr & IA64_ISR_SP) || ((isr & IA64_ISR_NA) && (isr & IA64_ISR_CODE_MASK) == IA64_ISR_CODE_LFETCH)) { ===== arch/ia64/mm/init.c 1.66 vs edited ===== --- 1.66/arch/ia64/mm/init.c 2004-08-24 02:08:33 -07:00 +++ edited/arch/ia64/mm/init.c 2004-09-08 14:09:07 -07:00 @@ -43,12 +43,10 @@ unsigned long MAX_DMA_ADDRESS = PAGE_OFFSET + 0x100000000UL; -#ifdef CONFIG_VIRTUAL_MEM_MAP unsigned long vmalloc_end = VMALLOC_END_INIT; EXPORT_SYMBOL(vmalloc_end); struct page *vmem_map; EXPORT_SYMBOL(vmem_map); -#endif static int pgt_cache_water[2] = { 25, 50 }; @@ -360,8 +358,6 @@ ia64_mca_tlb_list[cpu].ptce_stride[1] = local_cpu_data->ptce_stride[1]; } -#ifdef CONFIG_VIRTUAL_MEM_MAP - int create_mem_map_page_table (u64 start, u64 end, void *arg) { @@ -480,7 +476,6 @@ last_end = end; return 0; } -#endif /* CONFIG_VIRTUAL_MEM_MAP */ static int count_reserved_pages (u64 start, u64 end, void *arg) ===== include/asm-ia64/meminit.h 1.3 vs edited ===== --- 1.3/include/asm-ia64/meminit.h 2003-10-10 16:17:05 -07:00 +++ edited/include/asm-ia64/meminit.h 2004-09-08 14:10:40 -07:00 @@ -41,20 +41,14 @@ #define GRANULEROUNDUP(n) (((n)+IA64_GRANULE_SIZE-1) & ~(IA64_GRANULE_SIZE-1)) #define ORDERROUNDDOWN(n) ((n) & ~((PAGE_SIZE< than this */ - extern unsigned long vmalloc_end; - extern struct page *vmem_map; - extern int find_largest_hole (u64 start, u64 end, void *arg); - extern int create_mem_map_page_table (u64 start, u64 end, void *arg); -#endif +#define LARGE_GAP 0x40000000 /* Use virtual mem map if hole is > than this */ +extern unsigned long vmalloc_end; +extern struct page *vmem_map; +extern int find_largest_hole (u64 start, u64 end, void *arg); +extern int create_mem_map_page_table (u64 start, u64 end, void *arg); #endif /* meminit_h */ ===== include/asm-ia64/mmzone.h 1.8 vs edited ===== --- 1.8/include/asm-ia64/mmzone.h 2004-02-03 21:35:17 -08:00 +++ edited/include/asm-ia64/mmzone.h 2004-09-08 14:10:55 -07:00 @@ -15,8 +15,6 @@ #include #include -#ifdef CONFIG_DISCONTIGMEM - #ifdef CONFIG_IA64_DIG /* DIG systems are small */ # define MAX_PHYSNODE_ID 8 # define NR_NODES 8 @@ -33,7 +31,4 @@ #define page_to_pfn(page) ((unsigned long) (page - vmem_map)) #define pfn_to_page(pfn) (vmem_map + (pfn)) -#else /* CONFIG_DISCONTIGMEM */ -# define NR_NODE_MEMBLKS 4 -#endif /* CONFIG_DISCONTIGMEM */ #endif /* _ASM_IA64_MMZONE_H */ ===== include/asm-ia64/nodedata.h 1.6 vs edited ===== --- 1.6/include/asm-ia64/nodedata.h 2003-10-10 16:17:05 -07:00 +++ edited/include/asm-ia64/nodedata.h 2004-09-08 14:11:08 -07:00 @@ -17,8 +17,6 @@ #include #include -#ifdef CONFIG_DISCONTIGMEM - /* * Node Data. One of these structures is located on each node of a NUMA system. */ @@ -46,7 +44,5 @@ * completes. */ #define NODE_DATA(nid) (local_node_data->pg_data_ptrs[nid]) - -#endif /* CONFIG_DISCONTIGMEM */ #endif /* _ASM_IA64_NODEDATA_H */ ===== include/asm-ia64/page.h 1.28 vs edited ===== --- 1.28/include/asm-ia64/page.h 2004-09-05 13:48:22 -07:00 +++ edited/include/asm-ia64/page.h 2004-09-08 14:09:45 -07:00 @@ -77,23 +77,7 @@ #define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT) -#ifdef CONFIG_VIRTUAL_MEM_MAP extern int ia64_pfn_valid (unsigned long pfn); -#else -# define ia64_pfn_valid(pfn) 1 -#endif - -#ifndef CONFIG_DISCONTIGMEM -# ifdef CONFIG_VIRTUAL_MEM_MAP -extern struct page *vmem_map; -# define pfn_valid(pfn) (((pfn) < max_mapnr) && ia64_pfn_valid(pfn)) -# define page_to_pfn(page) ((unsigned long) (page - vmem_map)) -# define pfn_to_page(pfn) (vmem_map + (pfn)) -# endif -#define pfn_valid(pfn) (((pfn) < max_mapnr) && ia64_pfn_valid(pfn)) -#define page_to_pfn(page) ((unsigned long) (page - mem_map)) -#define pfn_to_page(pfn) (mem_map + (pfn)) -#endif /* CONFIG_DISCONTIGMEM */ #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) #define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) ===== include/asm-ia64/pgtable.h 1.45 vs edited ===== --- 1.45/include/asm-ia64/pgtable.h 2004-08-24 02:08:33 -07:00 +++ edited/include/asm-ia64/pgtable.h 2004-09-08 14:10:09 -07:00 @@ -207,13 +207,9 @@ #define RGN_KERNEL 7 #define VMALLOC_START 0xa000000200000000 -#ifdef CONFIG_VIRTUAL_MEM_MAP -# define VMALLOC_END_INIT (0xa000000000000000 + (1UL << (4*PAGE_SHIFT - 9))) -# define VMALLOC_END vmalloc_end - extern unsigned long vmalloc_end; -#else -# define VMALLOC_END (0xa000000000000000 + (1UL << (4*PAGE_SHIFT - 9))) -#endif +#define VMALLOC_END_INIT (0xa000000000000000 + (1UL << (4*PAGE_SHIFT - 9))) +#define VMALLOC_END vmalloc_end +extern unsigned long vmalloc_end; /* fs/proc/kcore.c */ #define kc_vaddr_to_offset(v) ((v) - 0xa000000000000000)