The following changes since commit fe75943b7808aac7ef001a1bd4d8159a95e758ac:
ARM: 6438/2: mmci: add SDIO support for ST Variants (2010-12-02 13:22:08 -0500)
are available in the git repository at: git://git.linaro.org/people/dmart/linux-2.6-arm.git for-linaro-2.6.36/accepted-by-rmk
Dave Martin (16): Revert "ARM: Avoid undefined Thumb-2 instructions using PC in compressed/head.S" ARM: kexec: Add missing memory clobber to inline asm in crash_setup_regs() ARM: kexec: Fix crash_setup_regs() for ARMv7 and CONFIG_THUMB2_KERNEL ARM: kuser: Fix incorrect cmpxchg syscall in kuser helpers ARM: RealView: Correct data alignment in headsmp.S for CONFIG_THUMB2_KERNEL ARM: vexpress: Correct data alignment in headsmp.S for CONFIG_THUMB2_KERNEL ARM: Allow SMP_ON_UP to work with Thumb-2 kernels. ARM: kexec: Correct data alignment for CONFIG_THUMB2_KERNEL ARM: vfp: Correct data alignment for CONFIG_THUMB2_KERNEL ARM: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in bootp/init.S ARM: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in kernel/head.S ARM: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in mm/proc-v7.S ARM: Thumb-2: Fix CONFIG_THUMB2_KERNEL breakage in compressed/head.S ARM: Thumb-2: Restore sensible zImage header layout for CONFIG_THUMB2_KERNEL ARM: Thumb-2: Fix long-distance conditional branches in head.S for Thumb-2. ARM: kprobes: Don't HAVE_KPROBES when CONFIG_THUMB2_KERNEL is selected
arch/arm/Kconfig | 4 ++-- arch/arm/boot/Makefile | 5 ----- arch/arm/boot/bootp/init.S | 2 ++ arch/arm/boot/compressed/head.S | 17 ++++++++++------- arch/arm/include/asm/assembler.h | 22 +++++++++++++++++++--- arch/arm/include/asm/kexec.h | 18 ++++++++++++++---- arch/arm/kernel/entry-armv.S | 6 +++--- arch/arm/kernel/head.S | 20 +++++++++++++++++--- arch/arm/kernel/relocate_kernel.S | 2 ++ arch/arm/mach-realview/headsmp.S | 1 + arch/arm/mach-vexpress/headsmp.S | 1 + arch/arm/mm/proc-v7.S | 4 ++-- arch/arm/vfp/vfphw.S | 1 + 13 files changed, 74 insertions(+), 29 deletions(-)
Merged and pushed out. I also merged the OMAP bits since you tested them somewhat and I did have a look at it. I also merged the gas workarounds (we're not mainline). The rest will be for tomorrow.
On Mon, 6 Dec 2010, Dave Martin wrote:
The following changes since commit fe75943b7808aac7ef001a1bd4d8159a95e758ac:
ARM: 6438/2: mmci: add SDIO support for ST Variants (2010-12-02 13:22:08 -0500)
are available in the git repository at: git://git.linaro.org/people/dmart/linux-2.6-arm.git for-linaro-2.6.36/accepted-by-rmk
Dave Martin (16): Revert "ARM: Avoid undefined Thumb-2 instructions using PC in compressed/head.S" ARM: kexec: Add missing memory clobber to inline asm in crash_setup_regs() ARM: kexec: Fix crash_setup_regs() for ARMv7 and CONFIG_THUMB2_KERNEL ARM: kuser: Fix incorrect cmpxchg syscall in kuser helpers ARM: RealView: Correct data alignment in headsmp.S for CONFIG_THUMB2_KERNEL ARM: vexpress: Correct data alignment in headsmp.S for CONFIG_THUMB2_KERNEL ARM: Allow SMP_ON_UP to work with Thumb-2 kernels. ARM: kexec: Correct data alignment for CONFIG_THUMB2_KERNEL ARM: vfp: Correct data alignment for CONFIG_THUMB2_KERNEL ARM: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in bootp/init.S ARM: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in kernel/head.S ARM: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in mm/proc-v7.S ARM: Thumb-2: Fix CONFIG_THUMB2_KERNEL breakage in compressed/head.S ARM: Thumb-2: Restore sensible zImage header layout for CONFIG_THUMB2_KERNEL ARM: Thumb-2: Fix long-distance conditional branches in head.S for Thumb-2. ARM: kprobes: Don't HAVE_KPROBES when CONFIG_THUMB2_KERNEL is selected
arch/arm/Kconfig | 4 ++-- arch/arm/boot/Makefile | 5 ----- arch/arm/boot/bootp/init.S | 2 ++ arch/arm/boot/compressed/head.S | 17 ++++++++++------- arch/arm/include/asm/assembler.h | 22 +++++++++++++++++++--- arch/arm/include/asm/kexec.h | 18 ++++++++++++++---- arch/arm/kernel/entry-armv.S | 6 +++--- arch/arm/kernel/head.S | 20 +++++++++++++++++--- arch/arm/kernel/relocate_kernel.S | 2 ++ arch/arm/mach-realview/headsmp.S | 1 + arch/arm/mach-vexpress/headsmp.S | 1 + arch/arm/mm/proc-v7.S | 4 ++-- arch/arm/vfp/vfphw.S | 1 + 13 files changed, 74 insertions(+), 29 deletions(-)
On Tue, Dec 7, 2010 at 12:37 AM, Nicolas Pitre nicolas.pitre@linaro.org wrote:
Merged and pushed out. I also merged the OMAP bits since you tested them somewhat and I did have a look at it. I also merged the gas workarounds (we're not mainline). The rest will be for tomorrow.
Yup, that sounds sensible.
Thanks!
---Dave
On Mon, 6 Dec 2010, Dave Martin wrote:
The following changes since commit fe75943b7808aac7ef001a1bd4d8159a95e758ac:
ARM: 6438/2: mmci: add SDIO support for ST Variants (2010-12-02 13:22:08 -0500)
are available in the git repository at: git://git.linaro.org/people/dmart/linux-2.6-arm.git for-linaro-2.6.36/accepted-by-rmk
Dave Martin (16): Revert "ARM: Avoid undefined Thumb-2 instructions using PC in compressed/head.S" ARM: kexec: Add missing memory clobber to inline asm in crash_setup_regs() ARM: kexec: Fix crash_setup_regs() for ARMv7 and CONFIG_THUMB2_KERNEL ARM: kuser: Fix incorrect cmpxchg syscall in kuser helpers ARM: RealView: Correct data alignment in headsmp.S for CONFIG_THUMB2_KERNEL ARM: vexpress: Correct data alignment in headsmp.S for CONFIG_THUMB2_KERNEL ARM: Allow SMP_ON_UP to work with Thumb-2 kernels. ARM: kexec: Correct data alignment for CONFIG_THUMB2_KERNEL ARM: vfp: Correct data alignment for CONFIG_THUMB2_KERNEL ARM: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in bootp/init.S ARM: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in kernel/head.S ARM: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in mm/proc-v7.S ARM: Thumb-2: Fix CONFIG_THUMB2_KERNEL breakage in compressed/head.S ARM: Thumb-2: Restore sensible zImage header layout for CONFIG_THUMB2_KERNEL ARM: Thumb-2: Fix long-distance conditional branches in head.S for Thumb-2. ARM: kprobes: Don't HAVE_KPROBES when CONFIG_THUMB2_KERNEL is selected
arch/arm/Kconfig | 4 ++-- arch/arm/boot/Makefile | 5 ----- arch/arm/boot/bootp/init.S | 2 ++ arch/arm/boot/compressed/head.S | 17 ++++++++++------- arch/arm/include/asm/assembler.h | 22 +++++++++++++++++++--- arch/arm/include/asm/kexec.h | 18 ++++++++++++++---- arch/arm/kernel/entry-armv.S | 6 +++--- arch/arm/kernel/head.S | 20 +++++++++++++++++--- arch/arm/kernel/relocate_kernel.S | 2 ++ arch/arm/mach-realview/headsmp.S | 1 + arch/arm/mach-vexpress/headsmp.S | 1 + arch/arm/mm/proc-v7.S | 4 ++-- arch/arm/vfp/vfphw.S | 1 + 13 files changed, 74 insertions(+), 29 deletions(-)
-
Dave Martin -
Nicolas Pitre