diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-23 16:26:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-23 16:26:16 -0400 |
| commit | 86c65a7857896b1de99628ad392556965c4841e6 (patch) | |
| tree | 8cb153af048348261f7244600076a44354ec94c9 /include | |
| parent | 20a52d4f5998f4804af7c27651490647da62fd08 (diff) | |
| parent | 7ffb65f84bd3852e4906c43b9e84dcc4e4d72d14 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
vmlinux.lds: fix .data..init_task output section (fix popwerpc boot)
powerpc: Fix erroneous lmb->memblock conversions
powerpc/mm: Add some debug output when hash insertion fails
powerpc/mm: Fix bugs in huge page hashing
powerpc/mm: Move around testing of _PAGE_PRESENT in hash code
powerpc/mm: Handle hypervisor pte insert failure in __hash_page_huge
powerpc/kexec: Fix boundary case for book-e kexec memory limits
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 4b5902ad0d5d..030a954ed292 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h | |||
| @@ -445,7 +445,7 @@ | |||
| 445 | */ | 445 | */ |
| 446 | #define INIT_TASK_DATA_SECTION(align) \ | 446 | #define INIT_TASK_DATA_SECTION(align) \ |
| 447 | . = ALIGN(align); \ | 447 | . = ALIGN(align); \ |
| 448 | .data..init_task : { \ | 448 | .data..init_task : AT(ADDR(.data..init_task) - LOAD_OFFSET) { \ |
| 449 | INIT_TASK_DATA(align) \ | 449 | INIT_TASK_DATA(align) \ |
| 450 | } | 450 | } |
| 451 | 451 | ||