tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge master.kernel.org:/home/rmk/linux-2.6-arm

Linus Torvalds 41b6c373 5f6b5517

+73 -55
unified split
+2 -2
arch/arm/mach-aaec2000/core.c
··· 128 128 129 129 static struct irqaction aaec2000_timer_irq = { 130 130 .name = "AAEC-2000 Timer Tick", 131 - .flags = SA_INTERRUPT, 132 - .handler = aaec2000_timer_interrupt 131 + .flags = SA_INTERRUPT | SA_TIMER, 132 + .handler = aaec2000_timer_interrupt, 133 133 }; 134 134 135 135 static void __init aaec2000_timer_init(void)
+2 -2
arch/arm/mach-clps711x/time.c
··· 57 57 58 58 static struct irqaction clps711x_timer_irq = { 59 59 .name = "CLPS711x Timer Tick", 60 - .flags = SA_INTERRUPT, 61 - .handler = p720t_timer_interrupt 60 + .flags = SA_INTERRUPT | SA_TIMER, 61 + .handler = p720t_timer_interrupt, 62 62 }; 63 63 64 64 static void __init clps711x_timer_init(void)
+2 -2
arch/arm/mach-clps7500/core.c
··· 298 298 299 299 static struct irqaction clps7500_timer_irq = { 300 300 .name = "CLPS7500 Timer Tick", 301 - .flags = SA_INTERRUPT, 302 - .handler = clps7500_timer_interrupt 301 + .flags = SA_INTERRUPT | SA_TIMER, 302 + .handler = clps7500_timer_interrupt, 303 303 }; 304 304 305 305 /*
+2 -2
arch/arm/mach-ebsa110/core.c
··· 173 173 174 174 static struct irqaction ebsa110_timer_irq = { 175 175 .name = "EBSA110 Timer Tick", 176 - .flags = SA_INTERRUPT, 177 - .handler = ebsa110_timer_interrupt 176 + .flags = SA_INTERRUPT | SA_TIMER, 177 + .handler = ebsa110_timer_interrupt, 178 178 }; 179 179 180 180 /*
+2 -2
arch/arm/mach-epxa10db/time.c
··· 56 56 57 57 static struct irqaction epxa10db_timer_irq = { 58 58 .name = "Excalibur Timer Tick", 59 - .flags = SA_INTERRUPT, 60 - .handler = epxa10db_timer_interrupt 59 + .flags = SA_INTERRUPT | SA_TIMER, 60 + .handler = epxa10db_timer_interrupt, 61 61 }; 62 62 63 63 /*
+1 -1
arch/arm/mach-footbridge/dc21285-timer.c
··· 43 43 static struct irqaction footbridge_timer_irq = { 44 44 .name = "Timer1 timer tick", 45 45 .handler = timer1_interrupt, 46 - .flags = SA_INTERRUPT, 46 + .flags = SA_INTERRUPT | SA_TIMER, 47 47 }; 48 48 49 49 /*
+1 -1
arch/arm/mach-footbridge/isa-timer.c
··· 72 72 static struct irqaction isa_timer_irq = { 73 73 .name = "ISA timer tick", 74 74 .handler = isa_timer_interrupt, 75 - .flags = SA_INTERRUPT, 75 + .flags = SA_INTERRUPT | SA_TIMER, 76 76 }; 77 77 78 78 static void __init isa_timer_init(void)
+2 -2
arch/arm/mach-h720x/cpu-h7201.c
··· 41 41 42 42 static struct irqaction h7201_timer_irq = { 43 43 .name = "h7201 Timer Tick", 44 - .flags = SA_INTERRUPT, 45 - .handler = h7201_timer_interrupt 44 + .flags = SA_INTERRUPT | SA_TIMER, 45 + .handler = h7201_timer_interrupt, 46 46 }; 47 47 48 48 /*
+2 -2
arch/arm/mach-h720x/cpu-h7202.c
··· 171 171 172 172 static struct irqaction h7202_timer_irq = { 173 173 .name = "h7202 Timer Tick", 174 - .flags = SA_INTERRUPT, 175 - .handler = h7202_timer_interrupt 174 + .flags = SA_INTERRUPT | SA_TIMER, 175 + .handler = h7202_timer_interrupt, 176 176 }; 177 177 178 178 /*
+2 -2
arch/arm/mach-imx/time.c
··· 72 72 73 73 static struct irqaction imx_timer_irq = { 74 74 .name = "i.MX Timer Tick", 75 - .flags = SA_INTERRUPT, 76 - .handler = imx_timer_interrupt 75 + .flags = SA_INTERRUPT | SA_TIMER, 76 + .handler = imx_timer_interrupt, 77 77 }; 78 78 79 79 /*
+2 -2
arch/arm/mach-integrator/core.c
··· 247 247 248 248 static struct irqaction integrator_timer_irq = { 249 249 .name = "Integrator Timer Tick", 250 - .flags = SA_INTERRUPT, 251 - .handler = integrator_timer_interrupt 250 + .flags = SA_INTERRUPT | SA_TIMER, 251 + .handler = integrator_timer_interrupt, 252 252 }; 253 253 254 254 /*
+1 -1
arch/arm/mach-iop3xx/iop321-time.c
··· 86 86 static struct irqaction iop321_timer_irq = { 87 87 .name = "IOP321 Timer Tick", 88 88 .handler = iop321_timer_interrupt, 89 - .flags = SA_INTERRUPT 89 + .flags = SA_INTERRUPT | SA_TIMER, 90 90 }; 91 91 92 92 static void __init iop321_timer_init(void)
+1 -1
arch/arm/mach-iop3xx/iop331-time.c
··· 83 83 static struct irqaction iop331_timer_irq = { 84 84 .name = "IOP331 Timer Tick", 85 85 .handler = iop331_timer_interrupt, 86 - .flags = SA_INTERRUPT 86 + .flags = SA_INTERRUPT | SA_TIMER, 87 87 }; 88 88 89 89 static void __init iop331_timer_init(void)
+7 -2
arch/arm/mach-ixp2000/core.c
··· 103 103 .length = IXP2000_PCI_CSR_SIZE, 104 104 .type = MT_DEVICE 105 105 }, { 106 + .virtual = IXP2000_MSF_VIRT_BASE, 107 + .physical = IXP2000_MSF_PHYS_BASE, 108 + .length = IXP2000_MSF_SIZE, 109 + .type = MT_DEVICE 110 + }, { 106 111 .virtual = IXP2000_PCI_IO_VIRT_BASE, 107 112 .physical = IXP2000_PCI_IO_PHYS_BASE, 108 113 .length = IXP2000_PCI_IO_SIZE, ··· 199 194 200 195 static struct irqaction ixp2000_timer_irq = { 201 196 .name = "IXP2000 Timer Tick", 202 - .flags = SA_INTERRUPT, 203 - .handler = ixp2000_timer_interrupt 197 + .flags = SA_INTERRUPT | SA_TIMER, 198 + .handler = ixp2000_timer_interrupt, 204 199 }; 205 200 206 201 void __init ixp2000_init_time(unsigned long tick_rate)
-6
arch/arm/mach-ixp2000/ixdp2800.c
··· 42 42 #include <asm/mach/flash.h> 43 43 #include <asm/mach/arch.h> 44 44 45 - 46 - void ixdp2400_init_irq(void) 47 - { 48 - ixdp2x00_init_irq(IXDP2800_CPLD_INT_STAT, IXDP2800_CPLD_INT_MASK, IXDP2400_NR_IRQS); 49 - } 50 - 51 45 /************************************************************************* 52 46 * IXDP2800 timer tick 53 47 *************************************************************************/
+2 -2
arch/arm/mach-ixp4xx/common.c
··· 298 298 299 299 static struct irqaction ixp4xx_timer_irq = { 300 300 .name = "IXP4xx Timer Tick", 301 - .flags = SA_INTERRUPT, 302 - .handler = ixp4xx_timer_interrupt 301 + .flags = SA_INTERRUPT | SA_TIMER, 302 + .handler = ixp4xx_timer_interrupt, 303 303 }; 304 304 305 305 static void __init ixp4xx_timer_init(void)
+2 -2
arch/arm/mach-lh7a40x/time.c
··· 53 53 54 54 static struct irqaction lh7a40x_timer_irq = { 55 55 .name = "LHA740x Timer Tick", 56 - .flags = SA_INTERRUPT, 57 - .handler = lh7a40x_timer_interrupt 56 + .flags = SA_INTERRUPT | SA_TIMER, 57 + .handler = lh7a40x_timer_interrupt, 58 58 }; 59 59 60 60 static void __init lh7a40x_timer_init(void)
+5 -5
arch/arm/mach-omap/time.c
··· 188 188 189 189 static struct irqaction omap_mpu_timer_irq = { 190 190 .name = "mpu timer", 191 - .flags = SA_INTERRUPT, 192 - .handler = omap_mpu_timer_interrupt 191 + .flags = SA_INTERRUPT | SA_TIMER, 192 + .handler = omap_mpu_timer_interrupt, 193 193 }; 194 194 195 195 static unsigned long omap_mpu_timer1_overflows; ··· 203 203 static struct irqaction omap_mpu_timer1_irq = { 204 204 .name = "mpu timer1 overflow", 205 205 .flags = SA_INTERRUPT, 206 - .handler = omap_mpu_timer1_interrupt 206 + .handler = omap_mpu_timer1_interrupt, 207 207 }; 208 208 209 209 static __init void omap_init_mpu_timer(void) ··· 349 349 350 350 static struct irqaction omap_32k_timer_irq = { 351 351 .name = "32KHz timer", 352 - .flags = SA_INTERRUPT, 353 - .handler = omap_32k_timer_interrupt 352 + .flags = SA_INTERRUPT | SA_TIMER, 353 + .handler = omap_32k_timer_interrupt, 354 354 }; 355 355 356 356 static __init void omap_init_32k_timer(void)
+2 -2
arch/arm/mach-pxa/time.c
··· 105 105 106 106 static struct irqaction pxa_timer_irq = { 107 107 .name = "PXA Timer Tick", 108 - .flags = SA_INTERRUPT, 109 - .handler = pxa_timer_interrupt 108 + .flags = SA_INTERRUPT | SA_TIMER, 109 + .handler = pxa_timer_interrupt, 110 110 }; 111 111 112 112 static void __init pxa_timer_init(void)
+2 -2
arch/arm/mach-s3c2410/time.c
··· 137 137 138 138 static struct irqaction s3c2410_timer_irq = { 139 139 .name = "S3C2410 Timer Tick", 140 - .flags = SA_INTERRUPT, 141 - .handler = s3c2410_timer_interrupt 140 + .flags = SA_INTERRUPT | SA_TIMER, 141 + .handler = s3c2410_timer_interrupt, 142 142 }; 143 143 144 144 /*
+1 -1
arch/arm/mach-sa1100/h3600.c
··· 727 727 static struct irqaction h3800_irq = { 728 728 .name = "h3800_asic", 729 729 .handler = h3800_IRQ_demux, 730 - .flags = SA_INTERRUPT, 730 + .flags = SA_INTERRUPT | SA_TIMER, 731 731 }; 732 732 733 733 u32 kpio_int_shadow = 0;
+2 -2
arch/arm/mach-sa1100/time.c
··· 99 99 100 100 static struct irqaction sa1100_timer_irq = { 101 101 .name = "SA11xx Timer Tick", 102 - .flags = SA_INTERRUPT, 103 - .handler = sa1100_timer_interrupt 102 + .flags = SA_INTERRUPT | SA_TIMER, 103 + .handler = sa1100_timer_interrupt, 104 104 }; 105 105 106 106 static void __init sa1100_timer_init(void)
+2 -2
arch/arm/mach-shark/core.c
··· 84 84 85 85 static struct irqaction shark_timer_irq = { 86 86 .name = "Shark Timer Tick", 87 - .flags = SA_INTERRUPT, 88 - .handler = shark_timer_interrupt 87 + .flags = SA_INTERRUPT | SA_TIMER, 88 + .handler = shark_timer_interrupt, 89 89 }; 90 90 91 91 /*
+2 -2
arch/arm/mach-versatile/core.c
··· 875 875 876 876 static struct irqaction versatile_timer_irq = { 877 877 .name = "Versatile Timer Tick", 878 - .flags = SA_INTERRUPT, 879 - .handler = versatile_timer_interrupt 878 + .flags = SA_INTERRUPT | SA_TIMER, 879 + .handler = versatile_timer_interrupt, 880 880 }; 881 881 882 882 /*
+2 -2
include/asm-arm/arch-ixp2000/ixdp2x00.h
··· 21 21 * On board CPLD memory map 22 22 */ 23 23 #define IXDP2X00_PHYS_CPLD_BASE 0xc7000000 24 - #define IXDP2X00_VIRT_CPLD_BASE 0xfafff000 25 - #define IXDP2X00_CPLD_SIZE 0x00001000 24 + #define IXDP2X00_VIRT_CPLD_BASE 0xfe000000 25 + #define IXDP2X00_CPLD_SIZE 0x00100000 26 26 27 27 28 28 #define IXDP2X00_CPLD_REG(x) \
+2 -2
include/asm-arm/arch-ixp2000/ixdp2x01.h
··· 18 18 #define __IXDP2X01_H__ 19 19 20 20 #define IXDP2X01_PHYS_CPLD_BASE 0xc6024000 21 - #define IXDP2X01_VIRT_CPLD_BASE 0xfafff000 22 - #define IXDP2X01_CPLD_REGION_SIZE 0x00001000 21 + #define IXDP2X01_VIRT_CPLD_BASE 0xfe000000 22 + #define IXDP2X01_CPLD_REGION_SIZE 0x00100000 23 23 24 24 #define IXDP2X01_CPLD_VIRT_REG(reg) (volatile unsigned long*)(IXDP2X01_VIRT_CPLD_BASE | reg) 25 25 #define IXDP2X01_CPLD_PHYS_REG(reg) (volatile u32*)(IXDP2X01_PHYS_CPLD_BASE | reg)
+19
include/asm-arm/arch-ixp2000/ixp2000-regs.h
··· 18 18 #ifndef _IXP2000_REGS_H_ 19 19 #define _IXP2000_REGS_H_ 20 20 21 + /* 22 + * IXP2000 linux memory map: 23 + * 24 + * virt phys size 25 + * fb000000 db000000 16M PCI CFG1 26 + * fc000000 da000000 16M PCI CFG0 27 + * fd000000 d8000000 16M PCI I/O 28 + * fe[0-7]00000 8M per-platform mappings 29 + * feb00000 c8000000 1M MSF 30 + * fec00000 df000000 1M PCI CSRs 31 + * fed00000 de000000 1M PCI CREG 32 + * fee00000 d6000000 1M INTCTL 33 + * fef00000 c0000000 1M CAP 34 + */ 35 + 21 36 /* 22 37 * Static I/O regions. 23 38 * ··· 85 70 #define IXP2000_PCI_CSR_PHYS_BASE 0xdf000000 86 71 #define IXP2000_PCI_CSR_VIRT_BASE 0xfec00000 87 72 #define IXP2000_PCI_CSR_SIZE 0x00100000 73 + 74 + #define IXP2000_MSF_PHYS_BASE 0xc8000000 75 + #define IXP2000_MSF_VIRT_BASE 0xfeb00000 76 + #define IXP2000_MSF_SIZE 0x00100000 88 77 89 78 #define IXP2000_PCI_IO_PHYS_BASE 0xd8000000 90 79 #define IXP2000_PCI_IO_VIRT_BASE 0xfd000000
+1 -1
include/asm-arm/arch-ixp2000/vmalloc.h
··· 17 17 * The vmalloc() routines leaves a hole of 4kB between each vmalloced 18 18 * area for the same reason. ;) 19 19 */ 20 - #define VMALLOC_END 0xfaffefff 20 + #define VMALLOC_END 0xfb000000