diff for duplicates of <1144102818.8279.6.camel@localhost.localdomain> diff --git a/a/1.txt b/N1/1.txt index eb3137b..5e9f8c8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -329,7 +329,7 @@ diff -urNp linux-2.6.16/arch/ia64/kernel/relocate_kernel.S linux-2.6.16-kexec/ar + ;; + + //first switch to physical mode -+ add r3\x1f-.reloc_entry, r2 ++ add r3=1f-.reloc_entry, r2 + movl r16 = IA64_PSR_AC|IA64_PSR_BN|IA64_PSR_IC|IA64_PSR_MFL + mov ar.rsc=0 // put RSE in enforced lazy mode + ;; @@ -478,7 +478,7 @@ diff -urNp linux-2.6.16/arch/ia64/kernel/relocate_kernel.S linux-2.6.16-kexec/ar + ;; + srlz.d + ;; -+ br.call.sptk.many b0¶;; ++ br.call.sptk.many b0=b6;; +memory_stack: + .fill 8192, 1, 0 +memory_stack_end: @@ -504,7 +504,7 @@ diff -urNp linux-2.6.16/arch/ia64/kernel/relocate_kernel.S linux-2.6.16-kexec/ar + /* See where I am running, and compute gp */ + { + mov ar.rsc = 0 /* Put RSE in enforce lacy, LE mode */ -+ mov gp = ip /* gp = relocate_new_kernel */ ++ mov gp = ip /* gp == relocate_new_kernel */ + } + + movl r8=0x00000100000000 @@ -513,7 +513,7 @@ diff -urNp linux-2.6.16/arch/ia64/kernel/relocate_kernel.S linux-2.6.16-kexec/ar + /* Transition from virtual to physical mode */ + srlz.i + ;; -+ add r17_-.rendez_entry, r25 ++ add r17=5f-.rendez_entry, r25 + movl r16=(IA64_PSR_AC | IA64_PSR_BN | IA64_PSR_IC | IA64_PSR_MFL) + ;; + tpa r17=r17 @@ -575,7 +575,7 @@ diff -urNp linux-2.6.16/arch/ia64/kernel/relocate_kernel.S linux-2.6.16-kexec/ar + + shr.u r9=r8,6 /* which irr */ + ;; -+ and r8c,r8 /* bit offset into irr */ ++ and r8=63,r8 /* bit offset into irr */ + ;; + mov r10=1;; + ;; @@ -638,7 +638,7 @@ diff -urNp linux-2.6.16/arch/ia64/kernel/relocate_kernel.S linux-2.6.16-kexec/ar + ;; + srlz.d + ;; -+ cmp.eq p0,p6\x15,r8 ++ cmp.eq p0,p6=15,r8 +(p6) br.cond.sptk.few call_start + br.sptk.few b6 +kexec_fake_sal_rendez_end: diff --git a/a/content_digest b/N1/content_digest index 3e1b4b3..efc8cf8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,6 @@ - "ref\01100550721.26287.32.camel@lyra.fc.hp.com\0" "From\0Khalid Aziz <khalid_aziz@hp.com>\0" "Subject\0[PATCH] kexec on ia64\0" - "Date\0Mon, 03 Apr 2006 22:20:18 +0000\0" + "Date\0Mon, 03 Apr 2006 16:20:18 -0600\0" "To\0LKML <linux-kernel@vger.kernel.org>" Fastboot mailing list <fastboot@lists.osdl.org> " Linux ia64 <linux-ia64@vger.kernel.org>\0" @@ -338,7 +337,7 @@ "+\t;;\n" "+\n" "+\t//first switch to physical mode\n" - "+\tadd r3\037-.reloc_entry, r2\n" + "+\tadd r3=1f-.reloc_entry, r2\n" "+\tmovl r16 = IA64_PSR_AC|IA64_PSR_BN|IA64_PSR_IC|IA64_PSR_MFL\n" "+\tmov ar.rsc=0\t \t// put RSE in enforced lazy mode\n" "+\t;;\n" @@ -487,7 +486,7 @@ "+\t;;\n" "+\tsrlz.d\n" "+\t;;\n" - "+\tbr.call.sptk.many b0\302\266;;\n" + "+\tbr.call.sptk.many b0=b6;;\n" "+memory_stack:\n" "+\t.fill 8192, 1, 0\n" "+memory_stack_end:\n" @@ -513,7 +512,7 @@ "+ /* See where I am running, and compute gp */\n" "+\t{\n" "+\t\tmov ar.rsc = 0 /* Put RSE in enforce lacy, LE mode */\n" - "+\t\tmov gp = ip /* gp = relocate_new_kernel */\n" + "+\t\tmov gp = ip /* gp == relocate_new_kernel */\n" "+\t}\n" "+\n" "+\tmovl r8=0x00000100000000\n" @@ -522,7 +521,7 @@ "+\t/* Transition from virtual to physical mode */\n" "+\tsrlz.i\n" "+\t;;\n" - "+\tadd\tr17_-.rendez_entry, r25\n" + "+\tadd\tr17=5f-.rendez_entry, r25\n" "+\tmovl\tr16=(IA64_PSR_AC | IA64_PSR_BN | IA64_PSR_IC | IA64_PSR_MFL)\n" "+\t;;\n" "+\ttpa\tr17=r17\n" @@ -584,7 +583,7 @@ "+\n" "+\tshr.u\tr9=r8,6\t\t\t/* which irr */\n" "+\t;;\n" - "+\tand\tr8c,r8\t\t/* bit offset into irr */\n" + "+\tand\tr8=63,r8\t\t/* bit offset into irr */\n" "+\t;;\n" "+\tmov\tr10=1;;\n" "+\t;;\n" @@ -647,7 +646,7 @@ "+\t;;\n" "+\tsrlz.d\n" "+\t;;\n" - "+\tcmp.eq\tp0,p6\025,r8\n" + "+\tcmp.eq\tp0,p6=15,r8\n" "+(p6)\tbr.cond.sptk.few\tcall_start\n" "+\tbr.sptk.few\t\tb6\n" "+kexec_fake_sal_rendez_end:\n" @@ -804,4 +803,4 @@ "+}\n" + -c9e88e0e4460e1b5d14c3a49915066409afb378155ec7a902f5802413a51bf6d +e25b19fba9c3d410813e8395a45bf65499a618d03b5954a47135aa05c1826832
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.