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

Configure Feed

Select the types of activity you want to include in your feed.

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

* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] fix lots of ARM __devexit sillyness
[ARM] 5417/1: Set the correct cacheid for ARMv6 CPUs with ARMv7 style MMU
[ARM] 5416/1: Use unused address in v6_early_abort
[ARM] 5411/1: S3C64XX: Fix EINT unmask
[ARM] at91: fix for Atmel AT91 powersaving
[ARM] RiscPC: Fix etherh oops

Linus Torvalds f41bf2ab 2450cf51

+22 -21
+7 -6
arch/arm/kernel/setup.c
··· 233 233 unsigned int cachetype = read_cpuid_cachetype(); 234 234 unsigned int arch = cpu_architecture(); 235 235 236 - if (arch >= CPU_ARCH_ARMv7) { 237 - cacheid = CACHEID_VIPT_NONALIASING; 238 - if ((cachetype & (3 << 14)) == 1 << 14) 239 - cacheid |= CACHEID_ASID_TAGGED; 240 - } else if (arch >= CPU_ARCH_ARMv6) { 241 - if (cachetype & (1 << 23)) 236 + if (arch >= CPU_ARCH_ARMv6) { 237 + if ((cachetype & (7 << 29)) == 4 << 29) { 238 + /* ARMv7 register format */ 239 + cacheid = CACHEID_VIPT_NONALIASING; 240 + if ((cachetype & (3 << 14)) == 1 << 14) 241 + cacheid |= CACHEID_ASID_TAGGED; 242 + } else if (cachetype & (1 << 23)) 242 243 cacheid = CACHEID_VIPT_ALIASING; 243 244 else 244 245 cacheid = CACHEID_VIPT_NONALIASING;
-1
arch/arm/mach-at91/pm.c
··· 332 332 at91_sys_read(AT91_AIC_IPR) & at91_sys_read(AT91_AIC_IMR)); 333 333 334 334 error: 335 - sdram_selfrefresh_disable(); 336 335 target_state = PM_SUSPEND_ON; 337 336 at91_irq_resume(); 338 337 at91_gpio_resume();
+2 -1
arch/arm/mm/abort-ev6.S
··· 23 23 #ifdef CONFIG_CPU_32v6K 24 24 clrex 25 25 #else 26 - strex r0, r1, [sp] @ Clear the exclusive monitor 26 + sub r1, sp, #4 @ Get unused stack location 27 + strex r0, r1, [r1] @ Clear the exclusive monitor 27 28 #endif 28 29 mrc p15, 0, r1, c5, c0, 0 @ get FSR 29 30 mrc p15, 0, r0, c6, c0, 0 @ get FAR
+1 -1
arch/arm/plat-s3c64xx/irq-eint.c
··· 55 55 u32 mask; 56 56 57 57 mask = __raw_readl(S3C64XX_EINT0MASK); 58 - mask |= eint_irq_to_bit(irq); 58 + mask &= ~eint_irq_to_bit(irq); 59 59 __raw_writel(mask, S3C64XX_EINT0MASK); 60 60 } 61 61
+1 -1
drivers/dma/iop-adma.c
··· 1401 1401 1402 1402 static struct platform_driver iop_adma_driver = { 1403 1403 .probe = iop_adma_probe, 1404 - .remove = iop_adma_remove, 1404 + .remove = __devexit_p(iop_adma_remove), 1405 1405 .driver = { 1406 1406 .owner = THIS_MODULE, 1407 1407 .name = "iop-adma",
+1 -1
drivers/dma/mv_xor.c
··· 1287 1287 1288 1288 static struct platform_driver mv_xor_driver = { 1289 1289 .probe = mv_xor_probe, 1290 - .remove = mv_xor_remove, 1290 + .remove = __devexit_p(mv_xor_remove), 1291 1291 .driver = { 1292 1292 .owner = THIS_MODULE, 1293 1293 .name = MV_XOR_NAME,
+2 -2
drivers/i2c/busses/i2c-mv64xxx.c
··· 482 482 return 0; 483 483 } 484 484 485 - static void __devexit 485 + static void 486 486 mv64xxx_i2c_unmap_regs(struct mv64xxx_i2c_data *drv_data) 487 487 { 488 488 if (drv_data->reg_base) { ··· 577 577 578 578 static struct platform_driver mv64xxx_i2c_driver = { 579 579 .probe = mv64xxx_i2c_probe, 580 - .remove = mv64xxx_i2c_remove, 580 + .remove = __devexit_p(mv64xxx_i2c_remove), 581 581 .driver = { 582 582 .owner = THIS_MODULE, 583 583 .name = MV64XXX_I2C_CTLR_NAME,
+1 -1
drivers/mtd/nand/orion_nand.c
··· 149 149 150 150 static struct platform_driver orion_nand_driver = { 151 151 .probe = orion_nand_probe, 152 - .remove = orion_nand_remove, 152 + .remove = __devexit_p(orion_nand_remove), 153 153 .driver = { 154 154 .name = "orion_nand", 155 155 .owner = THIS_MODULE,
+1 -1
drivers/net/arm/Makefile
··· 4 4 # 5 5 6 6 obj-$(CONFIG_ARM_AM79C961A) += am79c961a.o 7 - obj-$(CONFIG_ARM_ETHERH) += etherh.o ../8390.o 7 + obj-$(CONFIG_ARM_ETHERH) += etherh.o 8 8 obj-$(CONFIG_ARM_ETHER3) += ether3.o 9 9 obj-$(CONFIG_ARM_ETHER1) += ether1.o 10 10 obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o
+5 -5
drivers/net/arm/etherh.c
··· 641 641 .ndo_open = etherh_open, 642 642 .ndo_stop = etherh_close, 643 643 .ndo_set_config = etherh_set_config, 644 - .ndo_start_xmit = ei_start_xmit, 645 - .ndo_tx_timeout = ei_tx_timeout, 646 - .ndo_get_stats = ei_get_stats, 647 - .ndo_set_multicast_list = ei_set_multicast_list, 644 + .ndo_start_xmit = __ei_start_xmit, 645 + .ndo_tx_timeout = __ei_tx_timeout, 646 + .ndo_get_stats = __ei_get_stats, 647 + .ndo_set_multicast_list = __ei_set_multicast_list, 648 648 .ndo_validate_addr = eth_validate_addr, 649 649 .ndo_set_mac_address = eth_mac_addr, 650 650 .ndo_change_mtu = eth_change_mtu, 651 651 #ifdef CONFIG_NET_POLL_CONTROLLER 652 - .ndo_poll_controller = ei_poll, 652 + .ndo_poll_controller = __ei_poll, 653 653 #endif 654 654 }; 655 655
+1 -1
drivers/video/pxafb.c
··· 2230 2230 2231 2231 static struct platform_driver pxafb_driver = { 2232 2232 .probe = pxafb_probe, 2233 - .remove = pxafb_remove, 2233 + .remove = __devexit_p(pxafb_remove), 2234 2234 .suspend = pxafb_suspend, 2235 2235 .resume = pxafb_resume, 2236 2236 .driver = {