aboutsummaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorGabe Black <gabeblack@chromium.org>2011-11-16 23:32:50 +0000
committerGraeme Russ <graeme.russ@gmail.com>2011-11-29 21:30:51 +1100
commit60a9b6bfddbe1e3ae280fe5422ccd283bc31a591 (patch)
treea1cd47b0ca6f0fd8822e30cbdef9dfa6b2c4be7e /arch/x86
parent769db03a4a4ea1dc7e43c089c2227a0c8b4ffcbc (diff)
downloadu-boot-linaro-stable-60a9b6bfddbe1e3ae280fe5422ccd283bc31a591.tar.gz
x86: Fix a few recently added bugs
Signed-off-by: Gabe Black <gabeblack@chromium.org> Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/cpu/cpu.c1
-rw-r--r--arch/x86/lib/board.c6
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index 48d2f7aad..61d0b6941 100644
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -37,6 +37,7 @@
#include <asm/processor.h>
#include <asm/processor-flags.h>
#include <asm/interrupt.h>
+#include <linux/compiler.h>
/*
* Constructor for a conventional segment GDT (or LDT) entry
diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c
index 18e0edee8..d742fec92 100644
--- a/arch/x86/lib/board.c
+++ b/arch/x86/lib/board.c
@@ -220,6 +220,9 @@ static int do_elf_reloc_fixups(void)
Elf32_Addr *offset_ptr_rom;
Elf32_Addr *offset_ptr_ram;
+ /* The size of the region of u-boot that runs out of RAM. */
+ uintptr_t size = (uintptr_t)&__bss_end - (uintptr_t)&__text_start;
+
do {
/* Get the location from the relocation entry */
offset_ptr_rom = (Elf32_Addr *)re_src->r_offset;
@@ -228,7 +231,8 @@ static int do_elf_reloc_fixups(void)
if (offset_ptr_rom >= (Elf32_Addr *)CONFIG_SYS_TEXT_BASE) {
/* Switch to the in-RAM version */
- offset_ptr_ram = offset_ptr_rom + gd->reloc_off;
+ offset_ptr_ram = (Elf32_Addr *)((ulong)offset_ptr_rom +
+ gd->reloc_off);
/* Check that the target points into .text */
if (*offset_ptr_ram >= CONFIG_SYS_TEXT_BASE &&