diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2008-01-24 14:28:15 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2008-01-24 14:28:15 +0000 |
| commit | 1ab72c6d2a7e4f56f3c55411189ab4992d64c29c (patch) | |
| tree | 20c9206d643595d0e1646b7f07c71df28aa4a658 /packages/linux/linux-2.6.18/avr32-time-add-shared-interrupts.patch | |
| parent | 59c5c06d11e26e5435f8f0c2fd0902f1dece57dc (diff) | |
| parent | 62d4698b651ec93b84dcb2f04fffdbd2b420f103 (diff) | |
merge of 'aa327bc6909e97c6358a09ecd6fca8e61ae204e7'
and 'c0a3e474625678b13727e12b833983f6e3389de1'
Diffstat (limited to 'packages/linux/linux-2.6.18/avr32-time-add-shared-interrupts.patch')
| -rw-r--r-- | packages/linux/linux-2.6.18/avr32-time-add-shared-interrupts.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/packages/linux/linux-2.6.18/avr32-time-add-shared-interrupts.patch b/packages/linux/linux-2.6.18/avr32-time-add-shared-interrupts.patch new file mode 100644 index 0000000000..c626016ff4 --- /dev/null +++ b/packages/linux/linux-2.6.18/avr32-time-add-shared-interrupts.patch @@ -0,0 +1,30 @@ +--- linux-2.6.18.orig/arch/avr32/kernel/time.c 2006-11-06 14:36:50.000000000 +0100 ++++ linux-2.6.18/arch/avr32/kernel/time.c 2006-11-06 14:57:03.000000000 +0100 +@@ -21,6 +21,7 @@ + #include <linux/profile.h> + #include <linux/sysdev.h> + ++#include <asm/intc.h> + #include <asm/div64.h> + #include <asm/sysreg.h> + #include <asm/io.h> +@@ -136,6 +137,10 @@ + { + unsigned int count; + ++ /* Check if interrupt is timer or performance counters */ ++ if (!(intc_get_pending(irq) & 1)) ++ return IRQ_NONE; ++ + /* ack timer interrupt and try to set next interrupt */ + count = avr32_hpt_read(); + avr32_timer_ack(); +@@ -164,7 +169,7 @@ + + static struct irqaction timer_irqaction = { + .handler = timer_interrupt, +- .flags = IRQF_DISABLED, ++ .flags = IRQF_DISABLED|IRQF_SHARED, + .name = "timer", + }; + |