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 branch 'fixes2' into fixes

Three more warnings fixes from Arnd Bergmann:

* fixes2:
ARM: integrator: use __iomem pointers for MMIO, part 2
ARM: assabet: fix bogus warning in get_assabet_scr (again)
ARM: shmobile: mark shmobile_init_late as __init

Olof Johansson 782cd9ee 6e3a78d9

+7 -7
+1 -1
arch/arm/mach-integrator/include/mach/cm.h
··· 3 3 */ 4 4 void cm_control(u32, u32); 5 5 6 - #define CM_CTRL IO_ADDRESS(INTEGRATOR_HDR_CTRL) 6 + #define CM_CTRL __io_address(INTEGRATOR_HDR_CTRL) 7 7 8 8 #define CM_CTRL_LED (1 << 0) 9 9 #define CM_CTRL_nMBDET (1 << 1)
+3 -3
arch/arm/mach-integrator/include/mach/platform.h
··· 324 324 */ 325 325 #define PHYS_PCI_V3_BASE 0x62000000 326 326 327 - #define PCI_MEMORY_VADDR 0xe8000000 328 - #define PCI_CONFIG_VADDR 0xec000000 329 - #define PCI_V3_VADDR 0xed000000 327 + #define PCI_MEMORY_VADDR IOMEM(0xe8000000) 328 + #define PCI_CONFIG_VADDR IOMEM(0xec000000) 329 + #define PCI_V3_VADDR IOMEM(0xed000000) 330 330 331 331 /* ------------------------------------------------------------------------ 332 332 * Integrator Interrupt Controllers
+1 -1
arch/arm/mach-integrator/integrator_ap.c
··· 157 157 static void __init ap_map_io(void) 158 158 { 159 159 iotable_init(ap_io_desc, ARRAY_SIZE(ap_io_desc)); 160 - vga_base = PCI_MEMORY_VADDR; 160 + vga_base = (unsigned long)PCI_MEMORY_VADDR; 161 161 pci_map_io_early(__phys_to_pfn(PHYS_PCI_IO_BASE)); 162 162 } 163 163
+1 -1
arch/arm/mach-sa1100/assabet.c
··· 388 388 */ 389 389 static void __init get_assabet_scr(void) 390 390 { 391 - unsigned long scr, i; 391 + unsigned long uninitialized_var(scr), i; 392 392 393 393 GPDR |= 0x3fc; /* Configure GPIO 9:2 as outputs */ 394 394 GPSR = 0x3fc; /* Write 0xFF to GPIO 9:2 */
+1 -1
arch/arm/mach-shmobile/include/mach/common.h
··· 100 100 101 101 extern void shmobile_smp_init_cpus(unsigned int ncores); 102 102 103 - static inline void shmobile_init_late(void) 103 + static inline void __init shmobile_init_late(void) 104 104 { 105 105 shmobile_suspend_init(); 106 106 shmobile_cpuidle_init();