The patch titled
kexec: fix up KEXEC_CONTROL_CODE_SIZE missed during conversion
has been added to the -mm tree. Its filename is
kexec-fix-up-kexec_control_code_size-missed-during-conversion.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: kexec: fix up KEXEC_CONTROL_CODE_SIZE missed during conversion
From: Paul Collins <paul@xxxxxxxxxxxxxxxxxxx>
Commit 163f6876f5c3ff8215e900b93779e960a56b3694 ("kexec jump: rename
KEXEC_CONTROL_CODE_SIZE to KEXEC_CONTROL_PAGE_SIZE") missed one, resulting
in the following compile error:
AS arch/powerpc/kernel/misc_32.o
arch/powerpc/kernel/misc_32.S: Assembler messages:
arch/powerpc/kernel/misc_32.S:902: Error: unsupported relocation against KEXEC_CONTROL_CODE_SIZE
make[2]: *** [arch/powerpc/kernel/misc_32.o] Error 1
make[1]: *** [arch/powerpc/kernel] Error 2
make: *** [vmlinux] Error 2
I grepped arch/ and found no further instances.
Signed-off-by: Paul Collins <paul@xxxxxxxxxxxxx>
Cc: Huang Ying <ying.huang@xxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/powerpc/kernel/misc_32.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN arch/powerpc/kernel/misc_32.S~kexec-fix-up-kexec_control_code_size-missed-during-conversion arch/powerpc/kernel/misc_32.S
--- a/arch/powerpc/kernel/misc_32.S~kexec-fix-up-kexec_control_code_size-missed-during-conversion
+++ a/arch/powerpc/kernel/misc_32.S
@@ -899,7 +899,7 @@ relocate_new_kernel:
/* set a new stack at the bottom of our page... */
/* (not really needed now) */
- addi r1, r4, KEXEC_CONTROL_CODE_SIZE - 8 /* for LR Save+Back Chain */
+ addi r1, r4, KEXEC_CONTROL_PAGE_SIZE - 8 /* for LR Save+Back Chain */
stw r0, 0(r1)
/* Do the copies */
_
Patches currently in -mm which might be from paul@xxxxxxxxxxxxxxxxxxx are
kexec-fix-up-kexec_control_code_size-missed-during-conversion.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
