Hi Linus,
Please pull to get the latest m68knommu arch fixes. Not a lot in here,
mostly small fixes. The biggest change is Tim Abbott's linker script
cleanups.
git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git for-linus
Thanks
Greg
The following changes since commit 22763c5cf3690a681551162c15d34d935308c8d7:
Linus Torvalds (1):
Linux 2.6.32
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git for-linus
Greg Ungerer (3):
m68knommu: define arch_has_single_step() and friends
m68knommu: add a task_pt_regs() macro
m68knommu: rename BSS define in linker script
Lennart Sorensen (1):
m68knommu: add uboot commandline argument passing support
Steven King (2):
m68knommu: Coldfire GPIO corrections
m68knommu: export clk_* symbols in clk.c
Tim Abbott (7):
m68knommu: Don't hardcode the value of PAGE_SIZE in the linker script.
m68knommu: Make THREAD_SIZE available to assembly files.
m68knommu: Use INIT_TASK_DATA and CACHELINE_ALIGNED_DATA.
m68knommu: Use more macros inside the .init section.
m68knommu: Move __init_begin out of the .init section.
m68knommu: Move __init_end out of the .init section.
m68knommu: Split the .init section into INIT_TEXT_SECTION and INIT_DATA_SECTION.
Uwe Kleine-König (1):
m68knommu: move mcf_remove to .devexit.text
arch/m68k/include/asm/processor.h | 2 +
arch/m68k/include/asm/ptrace.h | 12 ++++
arch/m68k/include/asm/thread_info_no.h | 4 +-
arch/m68knommu/Kconfig | 7 ++
arch/m68knommu/kernel/ptrace.c | 18 +++++-
arch/m68knommu/kernel/setup.c | 92 ++++++++++++++++++++++++++++++-
arch/m68knommu/kernel/vmlinux.lds.S | 47 +++++-----------
arch/m68knommu/platform/523x/gpio.c | 5 +-
arch/m68knommu/platform/527x/gpio.c | 6 +-
arch/m68knommu/platform/528x/gpio.c | 2 +-
arch/m68knommu/platform/coldfire/clk.c | 7 ++-
arch/m68knommu/platform/coldfire/head.S | 10 +++
drivers/serial/mcf.c | 2 +-
13 files changed, 167 insertions(+), 47 deletions(-)
On Wed, 9 Dec 2009, Greg Ungerer wrote:
>
> Please pull to get the latest m68knommu arch fixes. Not a lot in here,
> mostly small fixes. The biggest change is Tim Abbott's linker script
> cleanups.
Hmm. I got a conflict due to the other m68k changes on the file
arch/m68k/include/asm/ptrace.h.
I fixed it up the way that seemed most appropriate, but somebody should
double-check. My resolution is not identical to either source branch tree.
Linus
Hi Linus,
Linus Torvalds wrote:
>
> On Wed, 9 Dec 2009, Greg Ungerer wrote:
>> Please pull to get the latest m68knommu arch fixes. Not a lot in here,
>> mostly small fixes. The biggest change is Tim Abbott's linker script
>> cleanups.
>
> Hmm. I got a conflict due to the other m68k changes on the file
> arch/m68k/include/asm/ptrace.h.
>
> I fixed it up the way that seemed most appropriate, but somebody should
> double-check. My resolution is not identical to either source branch tree.
The end result looks fine to me.
Regards
Greg
--
------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: [email protected]
SnapGear Group, McAfee PHONE: +61 7 3435 2888
8 Gardner Close FAX: +61 7 3217 5323
Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com