Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e2028aa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm 

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
parents ce9ec37b 178c3dfe

arch/arm/kernel/asm-offsets.c

+11 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#include <linux/compiler.h>

#include <linux/sched.h>

#include <linux/mm.h>

#include <linux/dma-mapping.h>
@@ -39,10 +40,19 @@ 
 * GCC 3.2.x: miscompiles NEW_AUX_ENT in fs/binfmt_elf.c

 *            (http://gcc.gnu.org/PR8896) and incorrect structure

 *	      initialisation in fs/jffs2/erase.c

 * GCC 4.8.0-4.8.2: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58854

 *	      miscompiles find_get_entry(), and can result in EXT3 and EXT4

 *	      filesystem corruption (possibly other FS too).

 */

#ifdef __GNUC__

#if (__GNUC__ == 3 && __GNUC_MINOR__ < 3)

#error Your compiler is too buggy; it is known to miscompile kernels.

#error    Known good compilers: 3.3

#error    Known good compilers: 3.3, 4.x

#endif

#if GCC_VERSION >= 40800 && GCC_VERSION < 40803

#error Your compiler is too buggy; it is known to miscompile kernels

#error and result in filesystem corruption and oopses.

#endif

#endif



int main(void)

arch/arm/mm/init.c

+4 −4
Original line number Diff line number Diff line
@@ -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)),