Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 75486 Details for
Bug 116670
New binutils assembler can prevent kernel-2.6 builds from booting on ia64
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
ia64-new-assembler-fix.patch
ia64-new-assembler-fix.patch (text/plain), 2.12 KB, created by
kfm
on 2005-12-25 00:25:48 UTC
(
hide
)
Description:
ia64-new-assembler-fix.patch
Filename:
MIME Type:
Creator:
kfm
Created:
2005-12-25 00:25:48 UTC
Size:
2.12 KB
patch
obsolete
>From: H. J. Lu <hjl@lucon.org> >Date: Fri, 7 Oct 2005 18:01:19 +0000 (-0700) >Subject: [IA64] Fix 2.6 kernel for the new ia64 assembler >X-Git-Tag: v2.6.14 >X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=9c184a073bfd650cc791956d6ca79725bb682716 > > [IA64] Fix 2.6 kernel for the new ia64 assembler > > The new ia64 assembler uses slot 1 for the offset of a long (2-slot) > instruction and the old assembler uses slot 2. The 2.6 kernel assumes > slot 2 and won't boot when the new assembler is used: > > http://sources.redhat.com/bugzilla/show_bug.cgi?id=1433 > > This patch will work with either slot 1 or 2. > > Patch provided by H.J. Lu > > Signed-off-by: Tony Luck <tony.luck@intel.com> >--- > >--- a/arch/ia64/kernel/patch.c >+++ b/arch/ia64/kernel/patch.c >@@ -64,22 +64,30 @@ ia64_patch (u64 insn_addr, u64 mask, u64 > void > ia64_patch_imm64 (u64 insn_addr, u64 val) > { >- ia64_patch(insn_addr, >+ /* The assembler may generate offset pointing to either slot 1 >+ or slot 2 for a long (2-slot) instruction, occupying slots 1 >+ and 2. */ >+ insn_addr &= -16UL; >+ ia64_patch(insn_addr + 2, > 0x01fffefe000UL, ( ((val & 0x8000000000000000UL) >> 27) /* bit 63 -> 36 */ > | ((val & 0x0000000000200000UL) << 0) /* bit 21 -> 21 */ > | ((val & 0x00000000001f0000UL) << 6) /* bit 16 -> 22 */ > | ((val & 0x000000000000ff80UL) << 20) /* bit 7 -> 27 */ > | ((val & 0x000000000000007fUL) << 13) /* bit 0 -> 13 */)); >- ia64_patch(insn_addr - 1, 0x1ffffffffffUL, val >> 22); >+ ia64_patch(insn_addr + 1, 0x1ffffffffffUL, val >> 22); > } > > void > ia64_patch_imm60 (u64 insn_addr, u64 val) > { >- ia64_patch(insn_addr, >+ /* The assembler may generate offset pointing to either slot 1 >+ or slot 2 for a long (2-slot) instruction, occupying slots 1 >+ and 2. */ >+ insn_addr &= -16UL; >+ ia64_patch(insn_addr + 2, > 0x011ffffe000UL, ( ((val & 0x0800000000000000UL) >> 23) /* bit 59 -> 36 */ > | ((val & 0x00000000000fffffUL) << 13) /* bit 0 -> 13 */)); >- ia64_patch(insn_addr - 1, 0x1fffffffffcUL, val >> 18); >+ ia64_patch(insn_addr + 1, 0x1fffffffffcUL, val >> 18); > } > > /*
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 116670
: 75486