linux-toradex.git/include, branch imx-android-r12 Linux kernel for Apalis and Colibri modules Merge branch 'imx_2.6.38' into imx_2.6.38_android 2011-08-05T06:19:31+00:00 Xinyu Chen b03824@freescale.com 2011-08-05T06:19:31+00:00 cd9856c350ab43dca3bec25b34e2298a212c8a29 






ENGR00154108-1 fsl_devices.h: make ldb support two ipu in separate mode
2011-08-05T03:25:32+00:00

Jason Chen
b02280@freescale.com

2011-08-04T05:18:46+00:00

1f6fc2b9c1d5311f984ba32cc6357ebf9fbc5682

make ldb support two ipu in separate mode

Signed-off-by: Jason Chen <b02280@freescale.com>





make ldb support two ipu in separate mode

Signed-off-by: Jason Chen <b02280@freescale.com>







futex: Sanitize futex ops argument types
2011-08-03T22:40:50+00:00

Michel Lespinasse
walken@google.com

2011-03-11T02:50:58+00:00

8118a7f45cc160547fb7b9c7fcc71a2601d56649

Change futex_atomic_op_inuser and futex_atomic_cmpxchg_inatomic
prototypes to use u32 types for the futex as this is the data type the
futex core code uses all over the place.

Signed-off-by: Michel Lespinasse <walken@google.com>
Cc: Darren Hart <darren@dvhart.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: David Howells <dhowells@redhat.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
LKML-Reference: <20110311025058.GD26122@google.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>





Change futex_atomic_op_inuser and futex_atomic_cmpxchg_inatomic
prototypes to use u32 types for the futex as this is the data type the
futex core code uses all over the place.

Signed-off-by: Michel Lespinasse <walken@google.com>
Cc: Darren Hart <darren@dvhart.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: David Howells <dhowells@redhat.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
LKML-Reference: <20110311025058.GD26122@google.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>







futex: Sanitize cmpxchg_futex_value_locked API
2011-08-03T22:40:50+00:00

Michel Lespinasse
walken@google.com

2011-03-11T02:48:51+00:00

fe094e6fbfc7745d5240d8672cc7d0be4ebc21ee

The cmpxchg_futex_value_locked API was funny in that it returned either
the original, user-exposed futex value OR an error code such as -EFAULT.
This was confusing at best, and could be a source of livelocks in places
that retry the cmpxchg_futex_value_locked after trying to fix the issue
by running fault_in_user_writeable().

This change makes the cmpxchg_futex_value_locked API more similar to the
get_futex_value_locked one, returning an error code and updating the
original value through a reference argument.

Signed-off-by: Michel Lespinasse <walken@google.com>
Acked-by: Chris Metcalf <cmetcalf@tilera.com>  [tile]
Acked-by: Tony Luck <tony.luck@intel.com>  [ia64]
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Michal Simek <monstr@monstr.eu>  [microblaze]
Acked-by: David Howells <dhowells@redhat.com> [frv]
Cc: Darren Hart <darren@dvhart.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
LKML-Reference: <20110311024851.GC26122@google.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>





The cmpxchg_futex_value_locked API was funny in that it returned either
the original, user-exposed futex value OR an error code such as -EFAULT.
This was confusing at best, and could be a source of livelocks in places
that retry the cmpxchg_futex_value_locked after trying to fix the issue
by running fault_in_user_writeable().

This change makes the cmpxchg_futex_value_locked API more similar to the
get_futex_value_locked one, returning an error code and updating the
original value through a reference argument.

Signed-off-by: Michel Lespinasse <walken@google.com>
Acked-by: Chris Metcalf <cmetcalf@tilera.com>  [tile]
Acked-by: Tony Luck <tony.luck@intel.com>  [ia64]
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Michal Simek <monstr@monstr.eu>  [microblaze]
Acked-by: David Howells <dhowells@redhat.com> [frv]
Cc: Darren Hart <darren@dvhart.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
LKML-Reference: <20110311024851.GC26122@google.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>







Merge branch 'imx_2.6.38' into merge-test
2011-08-01T07:48:20+00:00

Zhang Jiejing
jiejing.zhang@freescale.com

2011-08-01T07:48:20+00:00

935310eb715bb901f53df3bfb18b0a9ff0ce6fe8

Conflicts:
	arch/arm/mach-mx6/board-mx6q_sabreauto.c





Conflicts:
	arch/arm/mach-mx6/board-mx6q_sabreauto.c







ENGR00153740-1 asrc: update to use new SDMA API
2011-07-27T07:05:17+00:00

Dong Aisheng
b29396@freescale.com

2011-07-27T03:27:55+00:00

6d4edb55c7c6cb8fa1a61c4baa69febdcfe133c7

Only support one pair of buffer for rx and tx per time.

Signed-off-by: Dong Aisheng <b29396@freescale.com>





Only support one pair of buffer for rx and tx per time.

Signed-off-by: Dong Aisheng <b29396@freescale.com>







fix build error
2011-07-27T03:02:57+00:00

Xinyu Chen
xinyu.chen@freescale.com

2011-07-27T03:02:57+00:00

59f0065eac34ec8fe4e3efd6e353af5644d2d89e












Remove unused codes
2011-07-27T03:02:02+00:00

Xinyu Chen
xinyu.chen@freescale.com

2011-07-27T03:02:02+00:00

cfe731612588f664038829b59e67dc69795cac9a












Android: fix android build error.
2011-07-26T08:27:13+00:00

Zhang Jiejing
jiejing.zhang@freescale.com

2011-07-26T08:27:13+00:00

5528884c8dd1a801bbd16b91e8c008c125387af6

Signed-off-by: Zhang Jiejing <jiejing.zhang@freescale.com>





Signed-off-by: Zhang Jiejing <jiejing.zhang@freescale.com>







Merge remote branch 'android/android-2.6.38' into imx_2.6.38
2011-07-26T05:26:08+00:00

Zhang Jiejing
jiejing.zhang@freescale.com

2011-07-26T05:26:08+00:00

2e4eaa38676a115a943d164eacf7e3557b77fa0f

Conflicts:
	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/net/wireless/Makefile
	include/linux/mmc/mmc.h
	kernel/power/main.c





Conflicts:
	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/net/wireless/Makefile
	include/linux/mmc/mmc.h
	kernel/power/main.c