Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh into renesas/soc

Conflicts: arch/arm/mach-shmobile/board-ap4evb.c This moves the addition of init_consistent_dma_size() from the board files into the common sh7372_map_io() functions where all the other contents of the board specific map_io calls have gone. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2026-11-13 07:31:07 +00:00 · 2012-03-22 22:02:16 +00:00 · 2012-03-22 22:02:16 +00:00 · 426f1af947
commit 426f1af947
parent 5cd9eb2736 e9dd7ed2a3
57 changed files with 1708 additions and 2644 deletions
--- a/6
+++ b/6
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
--- a/arch/sh/kernel/cpu/sh2a/ex.S
+++ b/arch/sh/kernel/cpu/sh2a/ex.S
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7757.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7757.c
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7785.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7785.c
--- a/arch/sparc/Makefile
+++ b/arch/sparc/Makefile
--- a/arch/tile/configs/tilegx_defconfig
+++ b/arch/tile/configs/tilegx_defconfig
--- a/arch/tile/configs/tilepro_defconfig
+++ b/arch/tile/configs/tilepro_defconfig
--- a/arch/tile/kernel/compat_signal.c
+++ b/arch/tile/kernel/compat_signal.c
--- a/arch/tile/kernel/signal.c
+++ b/arch/tile/kernel/signal.c
--- a/arch/tile/kernel/sysfs.c
+++ b/arch/tile/kernel/sysfs.c
--- a/arch/tile/lib/spinlock_32.c
+++ b/arch/tile/lib/spinlock_32.c
--- a/arch/x86/kernel/cpu/perf_event_intel.c
+++ b/arch/x86/kernel/cpu/perf_event_intel.c
--- a/block/blk-ioc.c
+++ b/block/blk-ioc.c
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
--- a/block/genhd.c
+++ b/block/genhd.c
--- a/block/partition-generic.c
+++ b/block/partition-generic.c
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
--- a/drivers/net/wireless/iwlegacy/3945-mac.c
+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
--- a/drivers/net/wireless/iwlegacy/3945.c
+++ b/drivers/net/wireless/iwlegacy/3945.c
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
--- a/drivers/platform/x86/amilo-rfkill.c
+++ b/drivers/platform/x86/amilo-rfkill.c
--- a/drivers/platform/x86/fujitsu-tablet.c
+++ b/drivers/platform/x86/fujitsu-tablet.c
--- a/drivers/platform/x86/panasonic-laptop.c
+++ b/drivers/platform/x86/panasonic-laptop.c
--- a/drivers/regulator/da9052-regulator.c
+++ b/drivers/regulator/da9052-regulator.c
--- a/drivers/regulator/tps6524x-regulator.c
+++ b/drivers/regulator/tps6524x-regulator.c
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
--- a/fs/cifs/xattr.c
+++ b/fs/cifs/xattr.c
--- a/fs/inode.c
+++ b/fs/inode.c
--- a/fs/namei.c
+++ b/fs/namei.c
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
--- a/include/linux/iocontext.h
+++ b/include/linux/iocontext.h
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
--- a/lib/dynamic_queue_limits.c
+++ b/lib/dynamic_queue_limits.c
--- a/net/ipv4/syncookies.c
+++ b/net/ipv4/syncookies.c
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c