Please pull git390 'for-linus' branch
Please pull from 'for-linus' branch of
git://git390.osdl.marist.edu/pub/scm/linux-2.6.git for-linus
to receive the following updates:
arch/s390/Kconfig | 3 -- arch/s390/defconfig | 1 - arch/s390/kernel/setup.c | 55 +++++++++++++++++++++++++++++++++++----------- arch/s390/mm/init.c | 32 ++++++++++++++++++-------- 4 files changed, 64 insertions(+), 27 deletions(-)
Heiko Carstens (2):
[S390] revert add_active_range() usage patch. [S390] IRQs too early enabled.
arch/s390/Kconfig +0 -3
@@ -236,9 +236,6 @@ config WARN_STACK_SIZE This allows you to specify the maximum frame size a function may have without the compiler complaining about it. -config ARCH_POPULATES_NODE_MAP - def_bool y - source "mm/Kconfig" comment "I/O subsystem configuration"
arch/s390/defconfig +0 -1
@@ -119,7 +119,6 @@ # CONFIG_SMALL_STACK is not set CONFIG_CHECK_STACK=y CONFIG_STACK_GUARD=256 # CONFIG_WARN_STACK is not set -CONFIG_ARCH_POPULATES_NODE_MAP=y CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y # CONFIG_DISCONTIGMEM_MANUAL is not set
arch/s390/kernel/setup.c +42 -13
94 lines not on this page · raw message
arch/s390/mm/init.c +22 -10
@@ -84,6 +84,7 @@ void show_mem(void)printk ("%d pages swap cached\n" ,cached); } +extern unsigned long __initdata zholes_size[];/* * paging_init() sets up the page tables */
@@ -100,15 +101,16 @@ void __init paging_init(void)unsigned long pgdir_k = (__pa (swapper_pg_dir) &PAGE_MASK ) | _KERNSEG_TABLE;static const int ssm_mask =0x04000000L ;unsigned long ro_start_pfn, ro_end_pfn; -unsigned long max_zone_pfns[MAX_NR_ZONES ]; +unsigned long zones_size[MAX_NR_ZONES ]; ro_start_pfn =PFN_DOWN ((unsigned long )&__start_rodata); ro_end_pfn =PFN_UP ((unsigned long )&__end_rodata); -memset (max_zone_pfns,0 ,sizeof (max_zone_pfns)); - max_zone_pfns[ZONE_DMA ] = max_low_pfn; - max_zone_pfns[ZONE_NORMAL ] = max_low_pfn; -free_area_init_nodes (max_zone_pfns); +memset (zones_size,0 ,sizeof (zones_size)); + zones_size[ZONE_DMA ] = max_low_pfn; +free_area_init_node (0 , &contig_page_data, zones_size, +__pa (PAGE_OFFSET ) >>PAGE_SHIFT , + zholes_size);/* unmap whole virtual address space */
@@ -168,16 +170,26 @@ void __init paging_init(void)unsigned long pgdir_k = (__pa (swapper_pg_dir) &PAGE_MASK ) | _KERN_REGION_TABLE;static const int ssm_mask =0x04000000L ; +unsigned long zones_size[MAX_NR_ZONES ]; +unsigned long dma_pfn, high_pfn;unsigned long ro_start_pfn, ro_end_pfn; -unsigned long max_zone_pfns[MAX_NR_ZONES ]; +memset (zones_size,0 ,sizeof (zones_size)); + dma_pfn =MAX_DMA_ADDRESS >>PAGE_SHIFT ; + high_pfn = max_low_pfn; ro_start_pfn =PFN_DOWN ((unsigned long )&__start_rodata); ro_end_pfn =PFN_UP ((unsigned long )&__end_rodata); -memset (max_zone_pfns,0 ,sizeof (max_zone_pfns)); - max_zone_pfns[ZONE_DMA ] =PFN_DOWN (MAX_DMA_ADDRESS ); - max_zone_pfns[ZONE_NORMAL ] = max_low_pfn; -free_area_init_nodes (max_zone_pfns); +if (dma_pfn > high_pfn) + zones_size[ZONE_DMA ] = high_pfn; +else { + zones_size[ZONE_DMA ] = dma_pfn; + zones_size[ZONE_NORMAL ] = high_pfn - dma_pfn; + } + +/* Initialize mem_map[]. */ +free_area_init_node (0 , &contig_page_data, zones_size, +__pa (PAGE_OFFSET ) >>PAGE_SHIFT , zholes_size);/* * map whole physical memory to virtual memory (identity mapping)