Changeset 47f5a77 in mainline for kernel/arch/arm32/src/mach/beaglebone/beaglebone.c

Timestamp:

2013-07-17T08:46:06Z (11 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3a0a4d8

Parents:

cdc3afa (diff), 1d94e21 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• kernel/arch/arm32/src/mach/beaglebone/beaglebone.c (modified) (2 diffs)

kernel/arch/arm32/src/mach/beaglebone/beaglebone.c

@@ -177 +177 @@
 {
         const unsigned inum = am335x_irc_inum_get(bbone.irc_addr);
-        am335x_irc_irq_ack(bbone.irc_addr);
 
         irq_t *irq = irq_dispatch_and_lock(inum);
@@ -187 +186 @@
                 printf("Spurious interrupt\n");
         }
+
+        am335x_irc_irq_ack(bbone.irc_addr);
 }