[git pull] CRIS updates

From: Jesper Nilsson
Date: Mon May 11 2009 - 11:37:35 EST


Hi,

Four small fixes, although the merge of the boot files looks
larger than it is.

The following changes since commit a939b96cccdb65df80a52447ec8e4a6d79c56dbb:
Linus Torvalds (1):
Merge branch 'for-linus' of git://git.kernel.org/.../rafael/suspend-2.6

are available in the git repository at:

git://repo.or.cz/cris-mirror.git for-linus

Jesper Nilsson (4):
CRIS: Merge machine dependent boot/compressed and boot/rescue
CRISv32: Remove obsolete vcs_hook.o from Makefile
CRIS: Wire up syscalls signalfd4 to writev.
CRISv32: Fix typo compile error in ARTPEC-3 gpio driver.

arch/cris/Makefile | 14 +-
arch/cris/arch-v10/boot/compressed/Makefile | 27 ---
arch/cris/arch-v10/boot/compressed/README | 25 --
arch/cris/arch-v10/boot/compressed/misc.c | 246 --------------------
arch/cris/arch-v10/kernel/entry.S | 14 +-
arch/cris/arch-v32/boot/Makefile | 20 --
arch/cris/arch-v32/boot/compressed/Makefile | 26 --
arch/cris/arch-v32/boot/rescue/Makefile | 26 --
arch/cris/arch-v32/drivers/mach-a3/gpio.c | 4 +-
arch/cris/arch-v32/kernel/Makefile | 2 -
arch/cris/arch-v32/kernel/entry.S | 8 +
arch/cris/{arch-v10 => }/boot/.gitignore | 0
arch/cris/{arch-v10 => }/boot/Makefile | 8 +-
arch/cris/boot/compressed/Makefile | 38 +++
arch/cris/{arch-v32 => }/boot/compressed/README | 0
.../compressed/decompress_v10.lds} | 0
.../compressed/decompress_v32.lds} | 0
.../head.S => boot/compressed/head_v10.S} | 4 +-
.../head.S => boot/compressed/head_v32.S} | 10 +-
arch/cris/{arch-v32 => }/boot/compressed/misc.c | 193 +++++++++++-----
arch/cris/{arch-v10 => }/boot/rescue/Makefile | 22 ++-
.../boot/rescue/head.S => boot/rescue/head_v10.S} | 2 +-
.../boot/rescue/head.S => boot/rescue/head_v32.S} | 0
.../cris/{arch-v10 => }/boot/rescue/kimagerescue.S | 0
.../rescue.lds => boot/rescue/rescue_v10.lds} | 0
.../rescue.lds => boot/rescue/rescue_v32.lds} | 0
arch/cris/{arch-v10 => }/boot/rescue/testrescue.S | 0
arch/cris/{arch-v10 => }/boot/tools/build.c | 0
arch/cris/include/asm/unistd.h | 12 +-
29 files changed, 240 insertions(+), 461 deletions(-)
delete mode 100644 arch/cris/arch-v10/boot/compressed/Makefile
delete mode 100644 arch/cris/arch-v10/boot/compressed/README
delete mode 100644 arch/cris/arch-v10/boot/compressed/misc.c
delete mode 100644 arch/cris/arch-v32/boot/Makefile
delete mode 100644 arch/cris/arch-v32/boot/compressed/Makefile
delete mode 100644 arch/cris/arch-v32/boot/rescue/Makefile
rename arch/cris/{arch-v10 => }/boot/.gitignore (100%)
rename arch/cris/{arch-v10 => }/boot/Makefile (65%)
create mode 100644 arch/cris/boot/compressed/Makefile
rename arch/cris/{arch-v32 => }/boot/compressed/README (100%)
rename arch/cris/{arch-v10/boot/compressed/decompress.lds => boot/compressed/decompress_v10.lds} (100%)
rename arch/cris/{arch-v32/boot/compressed/decompress.lds => boot/compressed/decompress_v32.lds} (100%)
rename arch/cris/{arch-v10/boot/compressed/head.S => boot/compressed/head_v10.S} (97%)
rename arch/cris/{arch-v32/boot/compressed/head.S => boot/compressed/head_v32.S} (94%)
rename arch/cris/{arch-v32 => }/boot/compressed/misc.c (65%)
rename arch/cris/{arch-v10 => }/boot/rescue/Makefile (63%)
rename arch/cris/{arch-v10/boot/rescue/head.S => boot/rescue/head_v10.S} (99%)
rename arch/cris/{arch-v32/boot/rescue/head.S => boot/rescue/head_v32.S} (100%)
rename arch/cris/{arch-v10 => }/boot/rescue/kimagerescue.S (100%)
rename arch/cris/{arch-v10/boot/rescue/rescue.lds => boot/rescue/rescue_v10.lds} (100%)
rename arch/cris/{arch-v32/boot/rescue/rescue.lds => boot/rescue/rescue_v32.lds} (100%)
rename arch/cris/{arch-v10 => }/boot/rescue/testrescue.S (100%)
rename arch/cris/{arch-v10 => }/boot/tools/build.c (100%)


Thanks!

/^JN - Jesper Nilsson
--
Jesper Nilsson -- jesper.nilsson@xxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/