Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Oct 2014 20:17:11 +0000 (13:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Oct 2014 20:17:11 +0000 (13:17 -0700)
Pull ARM fixes from Russell King:
 "A couple of ARM fixes.

  We fix some printk formats for ptrdiff_t quantities which cause GCC
  4.9 to complain, and we also blacklist known buggy GCC 4.8.x compilers
  as their miscompilation is serious enough to cause filesystem
  corruption, even through many distros have fixed their versions"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: fix some printk formats
  ARM: Blacklist GCC 4.8.0 to GCC 4.8.2 - PR58854

1  2 
arch/arm/mm/init.c

diff --combined arch/arm/mm/init.c
@@@ -322,7 -322,7 +322,7 @@@ void __init arm_memblock_init(const str
         * reserve memory for DMA contigouos allocations,
         * must come from DMA area inside low memory
         */
 -      dma_contiguous_reserve(min(arm_dma_limit, arm_lowmem_limit));
 +      dma_contiguous_reserve(arm_dma_limit);
  
        arm_memblock_steal_permitted = false;
        memblock_dump_all();
@@@ -559,10 -559,10 +559,10 @@@ void __init mem_init(void
  #ifdef CONFIG_MODULES
                        "    modules : 0x%08lx - 0x%08lx   (%4ld MB)\n"
  #endif
-                       "      .text : 0x%p" " - 0x%p" "   (%4d kB)\n"
-                       "      .init : 0x%p" " - 0x%p" "   (%4d kB)\n"
-                       "      .data : 0x%p" " - 0x%p" "   (%4d kB)\n"
-                       "       .bss : 0x%p" " - 0x%p" "   (%4d kB)\n",
+                       "      .text : 0x%p" " - 0x%p" "   (%4td kB)\n"
+                       "      .init : 0x%p" " - 0x%p" "   (%4td kB)\n"
+                       "      .data : 0x%p" " - 0x%p" "   (%4td kB)\n"
+                       "       .bss : 0x%p" " - 0x%p" "   (%4td kB)\n",
  
                        MLK(UL(CONFIG_VECTORS_BASE), UL(CONFIG_VECTORS_BASE) +
                                (PAGE_SIZE)),
@@@ -636,11 -636,6 +636,11 @@@ static int keep_initrd
  void free_initrd_mem(unsigned long start, unsigned long end)
  {
        if (!keep_initrd) {
 +              if (start == initrd_start)
 +                      start = round_down(start, PAGE_SIZE);
 +              if (end == initrd_end)
 +                      end = round_up(end, PAGE_SIZE);
 +
                poison_init_mem((void *)start, PAGE_ALIGN(end) - start);
                free_reserved_area((void *)start, (void *)end, -1, "initrd");
        }