Skip to contentSkip to conversation

arm: arm: fiq: fix build breakage with CONFIG_FIQ

PATCH New Felipe Balbi 3 participants 4 messages Sep 17, 2014 – Sep 18, 2014 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm: arm: fiq: fix build breakage with CONFIG_FIQ

commit e1add97 (ARM: 8150/2: fiq: Replace default FIQ handler) has a typo which causes build breakage whenever CONFIG_FIQ is set.

The bug is very clear as can be noted that a new struct pt_regs def_fiq_regs was defined but code uses dfl_fiq_regs.

Cc Daniel Thompson <[email protected]>
Cc Catalin Marinas <[email protected]>
Cc Nicolas Pitre <[email protected]>
Fixes e1add97 (ARM: 8150/2: fiq: Replace default FIQ handler)

---

KernelVersion: next-20140917

Russell, let me know if this is the correct KernelVersion tag you want/need

 arch/arm/kernel/fiq.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/kernel/fiq.c +2 -2
index 1743049..b6ab4c7 100644
@@ -64,7 +64,7 @@ static int fiq_def_op(void *ref, int relinquish)
 	if (!relinquish) {
 		/* Restore default handler and registers */
 		local_fiq_disable();
-		set_fiq_regs(&dfl_fiq_regs);
+		set_fiq_regs(&def_fiq_regs);
 		set_fiq_handler(&no_fiq_insn, sizeof(no_fiq_insn));
 		local_fiq_enable();
 
@@ -159,6 +159,6 @@ void __init init_FIQ(int start)
 {
 	unsigned offset = FIQ_OFFSET;
 	no_fiq_insn = *(unsigned long *)(0xffff0000 + offset);
-	get_fiq_regs(&dfl_fiq_regs);
+	get_fiq_regs(&def_fiq_regs);
 	fiq_start = start;
 }
Signature · 1 line
2.1.0.243.g30d45f7
#1 lore raw

PATCH 1/1 arm: arm: fiq: fix build breakage with CONFIG_FIQ

Quoted 6 lines · Felipe Balbi

commit e1add97 (ARM: 8150/2: fiq: Replace default FIQ handler) has a typo which causes build breakage whenever CONFIG_FIQ is set.

The bug is very clear as can be noted that a new struct pt_regs def_fiq_regs was defined but code uses dfl_fiq_regs.

Quite so. My fault.

This error was picked up by Olof's autobuilder and I have offered a fix as 8150/3 (posted to mailing list in this thread
http://thread.gmane.org/gmane.linux.kernel/1789554 ).

Your fix and mine are slightly different (I standardised on dfl_fiq_regs) but both approaches should be functionally identical.

Daniel.

Quoted 36 lines
Cc Daniel Thompson <[email protected]>
Cc Catalin Marinas <[email protected]>
Cc Nicolas Pitre <[email protected]>
Fixes e1add97 (ARM: 8150/2: fiq: Replace default FIQ handler)

---

KernelVersion: next-20140917

Russell, let me know if this is the correct KernelVersion tag you want/need

 arch/arm/kernel/fiq.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/kernel/fiq.c +2 -2
index 1743049..b6ab4c7 100644
@@ -64,7 +64,7 @@ static int fiq_def_op(void *ref, int relinquish)
 	if (!relinquish) {
 		/* Restore default handler and registers */
 		local_fiq_disable();
-		set_fiq_regs(&dfl_fiq_regs);
+		set_fiq_regs(&def_fiq_regs);
 		set_fiq_handler(&no_fiq_insn, sizeof(no_fiq_insn));
 		local_fiq_enable();
 
@@ -159,6 +159,6 @@ void __init init_FIQ(int start)
 {
 	unsigned offset = FIQ_OFFSET;
 	no_fiq_insn = *(unsigned long *)(0xffff0000 + offset);
-	get_fiq_regs(&dfl_fiq_regs);
+	get_fiq_regs(&def_fiq_regs);
 	fiq_start = start;
 }
#2 lore raw

PATCH 1/1 arm: arm: fiq: fix build breakage with CONFIG_FIQ

Hi,

Quoted 5 lines · Daniel Thompson
Quoted 4 lines · Felipe Balbi

commit e1add97 (ARM: 8150/2: fiq: Replace default FIQ handler) has a typo which causes build breakage whenever CONFIG_FIQ is set.

Quoted 8 lines
Quoted 2 lines

The bug is very clear as can be noted that a new struct pt_regs def_fiq_regs was defined but code uses dfl_fiq_regs.

Quite so. My fault.

This error was picked up by Olof's autobuilder and I have offered a fix as 8150/3 (posted to mailing list in this thread
http://thread.gmane.org/gmane.linux.kernel/1789554 ).

aaa, alright. I missed that one :-)

Quoted 2 lines

Your fix and mine are slightly different (I standardised on dfl_fiq_regs) but both approaches should be functionally identical.

sure thing, no issues. I reckon it should be in next within the next couple days ?

cheers

Signature · 8 lines
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140917/db51f916/attachment.sig>
#3 lore raw

PATCH 1/1 arm: arm: fiq: fix build breakage with CONFIG_FIQ

Quoted 17 lines · Felipe Balbi

Hi,

Quoted 5 lines · Daniel Thompson
Quoted 4 lines · Felipe Balbi

commit e1add97 (ARM: 8150/2: fiq: Replace default FIQ handler) has a typo which causes build breakage whenever CONFIG_FIQ is set.

Quoted 8 lines
Quoted 2 lines

The bug is very clear as can be noted that a new struct pt_regs def_fiq_regs was defined but code uses dfl_fiq_regs.

Quite so. My fault.

This error was picked up by Olof's autobuilder and I have offered a fix as 8150/3 (posted to mailing list in this thread
http://thread.gmane.org/gmane.linux.kernel/1789554 ).

Quoted 7 lines

aaa, alright. I missed that one :-)

Quoted 2 lines

Your fix and mine are slightly different (I standardised on dfl_fiq_regs) but both approaches should be functionally identical.

sure thing, no issues. I reckon it should be in next within the next couple days ?

Should be in the next next. It missed last night's sfr pull.

Signature · 2 lines
FTTC broadband for 0.8mile line: currently at 9.5Mbps down 400kbps up
according to speedtest.net.