From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 31 Jul 2010 13:20:02 +0000 (+0100)
Subject: Merge branch 'misc' into devel
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ceb0885d3b01bb2e2f18765770e212914f2864be;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'misc' into devel

Conflicts:
	arch/arm/mm/init.c
---

ceb0885d3b01bb2e2f18765770e212914f2864be
diff --cc arch/arm/kernel/machine_kexec.c
index 81e989858d42,df5958f6864f..1fc74cbd1a19
--- a/arch/arm/kernel/machine_kexec.c
+++ b/arch/arm/kernel/machine_kexec.c
@@@ -37,16 -37,8 +37,12 @@@ void machine_kexec_cleanup(struct kimag
  {
  }
  
- void machine_shutdown(void)
- {
- }
- 
  void machine_crash_shutdown(struct pt_regs *regs)
  {
 +	local_irq_disable();
 +	crash_save_cpu(regs, smp_processor_id());
 +
 +	printk(KERN_INFO "Loading crashdump kernel...\n");
  }
  
  void machine_kexec(struct kimage *image)
diff --cc arch/arm/mm/init.c
index 599d121c81e7,e00404e6f45b..240b68d511dc
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@@ -431,14 -528,26 +431,19 @@@ static void __init free_unused_memmap(s
  void __init mem_init(void)
  {
  	unsigned long reserved_pages, free_pages;
 -	int i, node;
 +	int i;
+ #ifdef CONFIG_HAVE_TCM
+ 	/* These pointers are filled in on TCM detection */
+ 	extern u32 dtcm_end;
+ 	extern u32 itcm_end;
+ #endif
  
 -#ifndef CONFIG_DISCONTIGMEM
  	max_mapnr   = pfn_to_page(max_pfn + PHYS_PFN_OFFSET) - mem_map;
 -#endif
  
  	/* this will put all unused low memory onto the freelists */
 -	for_each_online_node(node) {
 -		pg_data_t *pgdat = NODE_DATA(node);
 -
 -		free_unused_memmap_node(node, &meminfo);
 +	free_unused_memmap(&meminfo);
  
 -		if (pgdat->node_spanned_pages != 0)
 -			totalram_pages += free_all_bootmem_node(pgdat);
 -	}
 +	totalram_pages += free_all_bootmem();
  
  #ifdef CONFIG_SA1111
  	/* now that our DMA memory is actually so designated, we can free it */