* fixes to the p2v series
@ 2011-02-02 5:00 Nicolas Pitre
2011-02-02 21:17 ` Russell King - ARM Linux
0 siblings, 1 reply; 3+ messages in thread
From: Nicolas Pitre @ 2011-02-02 5:00 UTC (permalink / raw)
To: linux-arm-kernel
Revisiting this series I found some minor issues. You might want to fold
in those fixes as appropriate:
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 17a97b5..9b1d2bd 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -494,7 +494,7 @@ __fixup_a_pv_table:
ldrcc r7, [r4], #4 @ use branch for delay slot
bcc 2b
mov pc, lr
-ENDPROC(__fixup_phys_virt)
+ENDPROC(__fixup_a_pv_table)
ENTRY(fixup_pv_table)
stmfd sp!, {r4 - r7, lr}
diff --git a/arch/arm/include/asm/module.h b/arch/arm/include/asm/module.h
index 3cf47d5..a2b775b 100644
--- a/arch/arm/include/asm/module.h
+++ b/arch/arm/include/asm/module.h
@@ -30,8 +30,8 @@ struct mod_arch_specific {
#define MODULE_ARCH_VERMAGIC_ARMVSN "ARMv" __stringify(__LINUX_ARM_ARCH__) " "
/* Add __virt_to_phys patching state as well */
-#ifdef ARM_PATCH_PHYS_VIRT
-#ifdef ARM_PATCH_PHYS_VIRT_16BIT
+#ifdef CONFIG_ARM_PATCH_PHYS_VIRT
+#ifdef CONFIG_ARM_PATCH_PHYS_VIRT_16BIT
#define MODULE_ARCH_VERMAGIC_P2V "p2v16 "
#else
#define MODULE_ARCH_VERMAGIC_P2V "p2v8 "
Nicolas
^ permalink raw reply related [flat|nested] 3+ messages in thread
* fixes to the p2v series
2011-02-02 5:00 fixes to the p2v series Nicolas Pitre
@ 2011-02-02 21:17 ` Russell King - ARM Linux
2011-02-02 21:57 ` Nicolas Pitre
0 siblings, 1 reply; 3+ messages in thread
From: Russell King - ARM Linux @ 2011-02-02 21:17 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Feb 02, 2011 at 12:00:54AM -0500, Nicolas Pitre wrote:
>
> Revisiting this series I found some minor issues. You might want to fold
> in those fixes as appropriate:
Thanks, merged those in. Can I have new acks for the p2v branch please?
^ permalink raw reply [flat|nested] 3+ messages in thread
* fixes to the p2v series
2011-02-02 21:17 ` Russell King - ARM Linux
@ 2011-02-02 21:57 ` Nicolas Pitre
0 siblings, 0 replies; 3+ messages in thread
From: Nicolas Pitre @ 2011-02-02 21:57 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, 2 Feb 2011, Russell King - ARM Linux wrote:
> On Wed, Feb 02, 2011 at 12:00:54AM -0500, Nicolas Pitre wrote:
> >
> > Revisiting this series I found some minor issues. You might want to fold
> > in those fixes as appropriate:
>
> Thanks, merged those in. Can I have new acks for the p2v branch please?
Yes, hopefully soon. I should also restore Thumb2
support in the process.
Nicolas
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-02-02 21:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-02 5:00 fixes to the p2v series Nicolas Pitre
2011-02-02 21:17 ` Russell King - ARM Linux
2011-02-02 21:57 ` Nicolas Pitre
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).