Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c0741fb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 628f87f3 118ec0b3

arch/arm/kernel/semaphore.c

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ int __down_trylock(struct semaphore * sem) 
 * registers (r0 to r3 and lr), but not ip, as we use it as a return

 * value in some cases..

 */

asm("	.section .sched.text,\"ax\"		\n\

asm("	.section .sched.text,\"ax\",%progbits	\n\

	.align	5				\n\

	.globl	__down_failed			\n\

__down_failed:					\n\

arch/arm/mach-ixp4xx/ixdp425-setup.c

+6 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ static void __init ixdp425_init(void) 
	platform_add_devices(ixdp425_devices, ARRAY_SIZE(ixdp425_devices));

}



#ifdef CONFIG_ARCH_IXDP465

MACHINE_START(IXDP425, "Intel IXDP425 Development Platform")

	/* Maintainer: MontaVista Software, Inc. */

	.phys_ram	= PHYS_OFFSET,
@@ -134,7 +135,9 @@ MACHINE_START(IXDP425, "Intel IXDP425 Development Platform") 
	.boot_params	= 0x0100,

	.init_machine	= ixdp425_init,

MACHINE_END

#endif



#ifdef CONFIG_MACH_IXDP465

MACHINE_START(IXDP465, "Intel IXDP465 Development Platform")

	/* Maintainer: MontaVista Software, Inc. */

	.phys_ram	= PHYS_OFFSET,
@@ -146,7 +149,9 @@ MACHINE_START(IXDP465, "Intel IXDP465 Development Platform") 
	.boot_params	= 0x0100,

	.init_machine	= ixdp425_init,

MACHINE_END

#endif



#ifdef CONFIG_ARCH_PRPMC1100

MACHINE_START(IXCDP1100, "Intel IXCDP1100 Development Platform")

	/* Maintainer: MontaVista Software, Inc. */

	.phys_ram	= PHYS_OFFSET,
@@ -158,6 +163,7 @@ MACHINE_START(IXCDP1100, "Intel IXCDP1100 Development Platform") 
	.boot_params	= 0x0100,

	.init_machine	= ixdp425_init,

MACHINE_END

#endif



/*

 * Avila is functionally equivalent to IXDP425 except that it adds

arch/arm/mach-sa1100/generic.h

+3 −0
Original line number Diff line number Diff line
@@ -39,3 +39,6 @@ extern void sa11x0_set_ssp_data(struct sa11x0_ssp_plat_ops *ops); 


struct irda_platform_data;

void sa11x0_set_irda_data(struct irda_platform_data *irda);



struct mcp_plat_data;

void sa11x0_set_mcp_data(struct mcp_plat_data *data);

include/asm-arm/futex.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr) 
	int cmp = (encoded_op >> 24) & 15;

	int oparg = (encoded_op << 8) >> 20;

	int cmparg = (encoded_op << 20) >> 20;

	int oldval = 0, ret, tem;

	int oldval = 0, ret;

	if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))

		oparg = 1 << oparg;