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 6c0741fb 628f87f3

+11 -2
unified split
+1 -1
arch/arm/kernel/semaphore.c
··· 178 * registers (r0 to r3 and lr), but not ip, as we use it as a return 179 * value in some cases.. 180 */ 181 - asm(" .section .sched.text,\"ax\" \n\ 182 .align 5 \n\ 183 .globl __down_failed \n\ 184 __down_failed: \n\
··· 178 * registers (r0 to r3 and lr), but not ip, as we use it as a return 179 * value in some cases.. 180 */ 181 + asm(" .section .sched.text,\"ax\",%progbits \n\ 182 .align 5 \n\ 183 .globl __down_failed \n\ 184 __down_failed: \n\
+6
arch/arm/mach-ixp4xx/ixdp425-setup.c
··· 123 platform_add_devices(ixdp425_devices, ARRAY_SIZE(ixdp425_devices)); 124 } 125 126 MACHINE_START(IXDP425, "Intel IXDP425 Development Platform") 127 /* Maintainer: MontaVista Software, Inc. */ 128 .phys_ram = PHYS_OFFSET, ··· 135 .boot_params = 0x0100, 136 .init_machine = ixdp425_init, 137 MACHINE_END 138 139 MACHINE_START(IXDP465, "Intel IXDP465 Development Platform") 140 /* Maintainer: MontaVista Software, Inc. */ 141 .phys_ram = PHYS_OFFSET, ··· 149 .boot_params = 0x0100, 150 .init_machine = ixdp425_init, 151 MACHINE_END 152 153 MACHINE_START(IXCDP1100, "Intel IXCDP1100 Development Platform") 154 /* Maintainer: MontaVista Software, Inc. */ 155 .phys_ram = PHYS_OFFSET, ··· 163 .boot_params = 0x0100, 164 .init_machine = ixdp425_init, 165 MACHINE_END 166 167 /* 168 * Avila is functionally equivalent to IXDP425 except that it adds
··· 123 platform_add_devices(ixdp425_devices, ARRAY_SIZE(ixdp425_devices)); 124 } 125 126 + #ifdef CONFIG_ARCH_IXDP465 127 MACHINE_START(IXDP425, "Intel IXDP425 Development Platform") 128 /* Maintainer: MontaVista Software, Inc. */ 129 .phys_ram = PHYS_OFFSET, ··· 134 .boot_params = 0x0100, 135 .init_machine = ixdp425_init, 136 MACHINE_END 137 + #endif 138 139 + #ifdef CONFIG_MACH_IXDP465 140 MACHINE_START(IXDP465, "Intel IXDP465 Development Platform") 141 /* Maintainer: MontaVista Software, Inc. */ 142 .phys_ram = PHYS_OFFSET, ··· 146 .boot_params = 0x0100, 147 .init_machine = ixdp425_init, 148 MACHINE_END 149 + #endif 150 151 + #ifdef CONFIG_ARCH_PRPMC1100 152 MACHINE_START(IXCDP1100, "Intel IXCDP1100 Development Platform") 153 /* Maintainer: MontaVista Software, Inc. */ 154 .phys_ram = PHYS_OFFSET, ··· 158 .boot_params = 0x0100, 159 .init_machine = ixdp425_init, 160 MACHINE_END 161 + #endif 162 163 /* 164 * Avila is functionally equivalent to IXDP425 except that it adds
+3
arch/arm/mach-sa1100/generic.h
··· 39 40 struct irda_platform_data; 41 void sa11x0_set_irda_data(struct irda_platform_data *irda);
··· 39 40 struct irda_platform_data; 41 void sa11x0_set_irda_data(struct irda_platform_data *irda); 42 + 43 + struct mcp_plat_data; 44 + void sa11x0_set_mcp_data(struct mcp_plat_data *data);
+1 -1
include/asm-arm/futex.h
··· 14 int cmp = (encoded_op >> 24) & 15; 15 int oparg = (encoded_op << 8) >> 20; 16 int cmparg = (encoded_op << 20) >> 20; 17 - int oldval = 0, ret, tem; 18 if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28)) 19 oparg = 1 << oparg; 20
··· 14 int cmp = (encoded_op >> 24) & 15; 15 int oparg = (encoded_op << 8) >> 20; 16 int cmparg = (encoded_op << 20) >> 20; 17 + int oldval = 0, ret; 18 if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28)) 19 oparg = 1 << oparg; 20