Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable

Conflicts:
	arch/arm/common/gic.c
	arch/arm/plat-omap/include/plat/common.h

1 files changed, 4 insertions, 2 deletions

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index a753880e984b..6c2b0db5d1e9 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -461,8 +461,10 @@ static void __init setup_processor(void)
                cpu_name, read_cpuid_id(), read_cpuid_id() & 15,
                proc_arch[cpu_architecture()], cr_alignment);
 
-        sprintf(init_utsname()->machine, "%s%c", list->arch_name, ENDIANNESS);
-        sprintf(elf_platform, "%s%c", list->elf_name, ENDIANNESS);
+        snprintf(init_utsname()->machine, __NEW_UTS_LEN + 1, "%s%c",
+                 list->arch_name, ENDIANNESS);
+        snprintf(elf_platform, ELF_PLATFORM_SIZE, "%s%c",
+                 list->elf_name, ENDIANNESS);
         elf_hwcap = list->elf_hwcap;
 #ifndef CONFIG_ARM_THUMB
         elf_hwcap &= ~HWCAP_THUMB;