111 files changed, 1215 insertions, 1879 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c8d94dcd8ef7..620f2ca94ed2 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -361,6 +361,11 @@ config NO_IDLE_HZ
          Alternatively, if you want dynamic tick automatically enabled
          during boot, pass "dyntick=enable" via the kernel command string.
+          Please note that dynamic tick may affect the accuracy of
+          timekeeping on some platforms depending on the implementation.
+          Currently at least OMAP platform is known to have accurate
+          timekeeping with dynamic tick.
 config ARCH_DISCONTIGMEM_ENABLE
        bool
        default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 8330495e2448..eb933dcafba0 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -56,7 +56,7 @@ tune-$(CONFIG_CPU_XSCALE)	:=$(call cc-option,-mtune=xscale,-mtune=strongarm110)
 tune-$(CONFIG_CPU_V6)           :=-mtune=strongarm
 # Need -Uarm for gcc < 3.x
-CFLAGS_ABI      :=$(call cc-option,-mapcs-32,-mabi=apcs-gnu)
+CFLAGS_ABI      :=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,)
 CFLAGS          +=$(CFLAGS_ABI) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm
 AFLAGS          +=$(CFLAGS_ABI) $(arch-y) $(tune-y) -msoft-float
diff --git a/arch/arm/configs/omnimeter_defconfig b/arch/arm/configs/omnimeter_defconfig
deleted file mode 100644
index 78fdb4a428b1..000000000000
--- a/arch/arm/configs/omnimeter_defconfig
+++ /dev/null
@@ -1,803 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-rc1-bk2
-# Sun Mar 27 21:31:45 2005
-#
-CONFIG_ARM=y
-CONFIG_MMU=y
-CONFIG_UID16=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_IOMAP=y
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_CLEAN_COMPILE=y
-CONFIG_BROKEN_ON_SMP=y
-#
-# General setup
-#
-CONFIG_LOCALVERSION=""
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_SYSCTL=y
-# CONFIG_AUDIT is not set
-CONFIG_HOTPLUG=y
-CONFIG_KOBJECT_UEVENT=y
-# CONFIG_IKCONFIG is not set
-# CONFIG_EMBEDDED is not set
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_SHMEM=y
-CONFIG_CC_ALIGN_FUNCTIONS=0
-CONFIG_CC_ALIGN_LABELS=0
-CONFIG_CC_ALIGN_LOOPS=0
-CONFIG_CC_ALIGN_JUMPS=0
-# CONFIG_TINY_SHMEM is not set
-CONFIG_BASE_SMALL=0
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-# CONFIG_MODULE_UNLOAD is not set
-CONFIG_OBSOLETE_MODPARM=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_KMOD=y
-#
-# System Type
-#
-# CONFIG_ARCH_CLPS7500 is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_CO285 is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_CAMELOT is not set
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP3XX is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_RPC is not set
-CONFIG_ARCH_SA1100=y
-# CONFIG_ARCH_S3C2410 is not set
-# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_H720X is not set
-#
-# SA11x0 Implementations
-#
-# CONFIG_SA1100_ASSABET is not set
-# CONFIG_SA1100_CERF is not set
-# CONFIG_SA1100_COLLIE is not set
-# CONFIG_SA1100_H3100 is not set
-# CONFIG_SA1100_H3600 is not set
-# CONFIG_SA1100_H3800 is not set
-# CONFIG_SA1100_BADGE4 is not set
-# CONFIG_SA1100_JORNADA720 is not set
-# CONFIG_SA1100_HACKKIT is not set
-# CONFIG_SA1100_LART is not set
-# CONFIG_SA1100_PLEB is not set
-# CONFIG_SA1100_SHANNON is not set
-# CONFIG_SA1100_SIMPAD is not set
-# CONFIG_SA1100_SSP is not set
-#
-# Processor Type
-#
-CONFIG_CPU_32=y
-CONFIG_CPU_SA1100=y
-CONFIG_CPU_32v4=y
-CONFIG_CPU_ABRT_EV4=y
-CONFIG_CPU_CACHE_V4WB=y
-CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_TLB_V4WB=y
-CONFIG_CPU_MINICACHE=y
-#
-# Processor Features
-#
-#
-# Bus support
-#
-CONFIG_ISA=y
-#
-# PCCARD (PCMCIA/CardBus) support
-#
-CONFIG_PCCARD=y
-# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_PCMCIA=y
-#
-# PC-card bridges
-#
-CONFIG_I82365=y
-# CONFIG_TCIC is not set
-CONFIG_PCMCIA_SA1100=y
-CONFIG_PCCARD_NONSTATIC=y
-#
-# Kernel Features
-#
-# CONFIG_PREEMPT is not set
-CONFIG_DISCONTIGMEM=y
-# CONFIG_LEDS is not set
-CONFIG_ALIGNMENT_TRAP=y
-#
-# Boot options
-#
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="keepinitrd mem=16M root=/dev/ram ramdisk=8192 initrd=0xd0000000,4M"
-# CONFIG_XIP_KERNEL is not set
-#
-# CPU Frequency scaling
-#
-# CONFIG_CPU_FREQ is not set
-#
-# Floating point emulation
-#
-#
-# At least one emulation must be selected
-#
-# CONFIG_FPE_NWFPE is not set
-# CONFIG_FPE_FASTFPE is not set
-#
-# Userspace binary formats
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_AOUT=y
-# CONFIG_BINFMT_MISC is not set
-# CONFIG_ARTHUR is not set
-#
-# Power management options
-#
-# CONFIG_PM is not set
-#
-# Device Drivers
-#
-#
-# Generic Driver Options
-#
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_FW_LOADER is not set
-#
-# Memory Technology Devices (MTD)
-#
-# CONFIG_MTD is not set
-#
-# Parallel port support
-#
-# CONFIG_PARPORT is not set
-#
-# Plug and Play support
-#
-# CONFIG_PNP is not set
-#
-# Block devices
-#
-# CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_DEV_XD is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=m
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-CONFIG_BLK_DEV_NBD=m
-# CONFIG_BLK_DEV_RAM is not set
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_CDROM_PKTCDVD is not set
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_ATA_OVER_ETH is not set
-#
-# ATA/ATAPI/MFM/RLL support
-#
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
-# CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_BLK_DEV_IDECS is not set
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=y
-# CONFIG_IDE_ARM is not set
-# CONFIG_IDE_CHIPSETS is not set
-# CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDEDMA_AUTO is not set
-# CONFIG_BLK_DEV_HD is not set
-#
-# SCSI device support
-#
-# CONFIG_SCSI is not set
-#
-# Multi-device support (RAID and LVM)
-#
-# CONFIG_MD is not set
-#
-# Fusion MPT device support
-#
-#
-# IEEE 1394 (FireWire) support
-#
-#
-# I2O device support
-#
-#
-# Networking support
-#
-CONFIG_NET=y
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-# CONFIG_NETLINK_DEV is not set
-CONFIG_UNIX=y
-# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-# CONFIG_IP_ADVANCED_ROUTER is not set
-# CONFIG_IP_PNP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_IP_MROUTE is not set
-# CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_TUNNEL is not set
-CONFIG_IP_TCPDIAG=y
-# CONFIG_IP_TCPDIAG_IPV6 is not set
-#
-# IP: Virtual Server Configuration
-#
-# CONFIG_IP_VS is not set
-# CONFIG_IPV6 is not set
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-#
-# IP: Netfilter Configuration
-#
-# CONFIG_IP_NF_CONNTRACK is not set
-# CONFIG_IP_NF_CONNTRACK_MARK is not set
-# CONFIG_IP_NF_QUEUE is not set
-# CONFIG_IP_NF_IPTABLES is not set
-# CONFIG_IP_NF_ARPTABLES is not set
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_SCTP is not set
-# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-#
-# QoS and/or fair queueing
-#
-# CONFIG_NET_SCHED is not set
-# CONFIG_NET_CLS_ROUTE is not set
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
-CONFIG_NETDEVICES=y
-# CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
-#
-# ARCnet devices
-#
-# CONFIG_ARCNET is not set
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-# CONFIG_MII is not set
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_LANCE is not set
-# CONFIG_NET_VENDOR_SMC is not set
-# CONFIG_SMC91X is not set
-# CONFIG_NET_VENDOR_RACAL is not set
-# CONFIG_AT1700 is not set
-# CONFIG_DEPCA is not set
-# CONFIG_HP100 is not set
-# CONFIG_NET_ISA is not set
-# CONFIG_NET_PCI is not set
-# CONFIG_NET_POCKET is not set
-#
-# Ethernet (1000 Mbit)
-#
-#
-# Ethernet (10000 Mbit)
-#
-#
-# Token Ring devices
-#
-# CONFIG_TR is not set
-#
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-#
-# Obsolete Wireless cards support (pre-802.11)
-#
-# CONFIG_STRIP is not set
-# CONFIG_ARLAN is not set
-# CONFIG_WAVELAN is not set
-CONFIG_PCMCIA_WAVELAN=y
-# CONFIG_PCMCIA_NETWAVE is not set
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
-# CONFIG_PCMCIA_RAYCS is not set
-#
-# Wireless 802.11b ISA/PCI cards support
-#
-# CONFIG_HERMES is not set
-# CONFIG_ATMEL is not set
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
-CONFIG_AIRO_CS=y
-CONFIG_PCMCIA_WL3501=y
-CONFIG_NET_WIRELESS=y
-#
-# PCMCIA network device support
-#
-CONFIG_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=y
-# CONFIG_PCMCIA_3C574 is not set
-# CONFIG_PCMCIA_FMVJ18X is not set
-CONFIG_PCMCIA_PCNET=y
-# CONFIG_PCMCIA_NMCLAN is not set
-# CONFIG_PCMCIA_SMC91C92 is not set
-# CONFIG_PCMCIA_XIRC2PS is not set
-# CONFIG_PCMCIA_AXNET is not set
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
-# CONFIG_SHAPER is not set
-# CONFIG_NETCONSOLE is not set
-#
-# ISDN subsystem
-#
-# CONFIG_ISDN is not set
-#
-# Input device support
-#
-CONFIG_INPUT=y
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_EVBUG is not set
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ATKBD=y
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=y
-# CONFIG_MOUSE_SERIAL is not set
-# CONFIG_MOUSE_INPORT is not set
-# CONFIG_MOUSE_LOGIBM is not set
-# CONFIG_MOUSE_PC110PAD is not set
-# CONFIG_MOUSE_VSXXXAA is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_SERIO_SERPORT=y
-CONFIG_SERIO_LIBPS2=y
-# CONFIG_SERIO_RAW is not set
-# CONFIG_GAMEPORT is not set
-CONFIG_SOUND_GAMEPORT=y
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-# CONFIG_SERIAL_NONSTANDARD is not set
-#
-# Serial drivers
-#
-# CONFIG_SERIAL_8250 is not set
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_SA1100=y
-CONFIG_SERIAL_SA1100_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
-#
-# IPMI
-#
-# CONFIG_IPMI_HANDLER is not set
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
-# CONFIG_NVRAM is not set
-# CONFIG_RTC is not set
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set
-#
-# Ftape, the floppy tape device driver
-#
-# CONFIG_DRM is not set
-#
-# PCMCIA character devices
-#
-# CONFIG_SYNCLINK_CS is not set
-# CONFIG_RAW_DRIVER is not set
-#
-# TPM devices
-#
-# CONFIG_TCG_TPM is not set
-#
-# I2C support
-#
-# CONFIG_I2C is not set
-#
-# Misc devices
-#
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-#
-# Graphics support
-#
-CONFIG_FB=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SOFT_CURSOR=y
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
-CONFIG_FB_SA1100=y
-# CONFIG_FB_VIRTUAL is not set
-#
-# Console display driver support
-#
-# CONFIG_VGA_CONSOLE is not set
-# CONFIG_MDA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-# CONFIG_FONT_8x16 is not set
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-#
-# Logo configuration
-#
-# CONFIG_LOGO is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-#
-# Sound
-#
-# CONFIG_SOUND is not set
-#
-# USB support
-#
-CONFIG_USB_ARCH_HAS_HCD=y
-# CONFIG_USB_ARCH_HAS_OHCI is not set
-# CONFIG_USB is not set
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-#
-# MMC/SD Card support
-#
-# CONFIG_MMC is not set
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_JBD is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-#
-# XFS support
-#
-# CONFIG_XFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_QUOTA is not set
-CONFIG_DNOTIFY=y
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-#
-# CD-ROM/DVD Filesystems
-#
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=y
-CONFIG_MSDOS_FS=y
-# CONFIG_VFAT_FS is not set
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-# CONFIG_NTFS_FS is not set
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_SYSFS=y
-# CONFIG_DEVFS_FS is not set
-# CONFIG_DEVPTS_FS_XATTR is not set
-# CONFIG_TMPFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
-#
-# Miscellaneous filesystems
-#
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-#
-# Network File Systems
-#
-CONFIG_NFS_FS=y
-# CONFIG_NFS_V3 is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFS_DIRECTIO is not set
-# CONFIG_NFSD is not set
-CONFIG_LOCKD=y
-CONFIG_SUNRPC=y
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_CIFS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-#
-# Partition Types
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
-#
-# Native Language Support
-#
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS_CODEPAGE_437 is not set
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_ASCII is not set
-# CONFIG_NLS_ISO8859_1 is not set
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
-#
-# Profiling support
-#
-# CONFIG_PROFILING is not set
-#
-# Kernel hacking
-#
-# CONFIG_PRINTK_TIME is not set
-# CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_DEBUG_USER is not set
-#
-# Security options
-#
-# CONFIG_KEYS is not set
-# CONFIG_SECURITY is not set
-#
-# Cryptographic options
-#
-# CONFIG_CRYPTO is not set
-#
-# Hardware crypto devices
-#
-#
-# Library routines
-#
-# CONFIG_CRC_CCITT is not set
-CONFIG_CRC32=y
-# CONFIG_LIBCRC32C is not set
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
index 4c38bd8bc298..835d450797a1 100644
--- a/arch/arm/kernel/armksyms.c
+++ b/arch/arm/kernel/armksyms.c
@@ -30,9 +30,6 @@ extern void __lshrdi3(void);
 extern void __modsi3(void);
 extern void __muldi3(void);
 extern void __ucmpdi2(void);
-extern void __udivdi3(void);
-extern void __umoddi3(void);
-extern void __udivmoddi4(void);
 extern void __udivsi3(void);
 extern void __umodsi3(void);
 extern void __do_div64(void);
@@ -44,7 +41,10 @@ extern void fp_enter(void);
 * This has a special calling convention; it doesn't
 * modify any of the usual registers, except for LR.
 */
+#define EXPORT_CRC_ALIAS(sym) __CRC_SYMBOL(sym, "")
 #define EXPORT_SYMBOL_ALIAS(sym,orig)           \
+ EXPORT_CRC_ALIAS(sym)                          \
 const struct kernel_symbol __ksymtab_##sym     \
  __attribute__((section("__ksymtab"))) =       \
    { (unsigned long)&orig, #sym };
@@ -134,9 +134,6 @@ EXPORT_SYMBOL(__lshrdi3);
 EXPORT_SYMBOL(__modsi3);
 EXPORT_SYMBOL(__muldi3);
 EXPORT_SYMBOL(__ucmpdi2);
-EXPORT_SYMBOL(__udivdi3);
-EXPORT_SYMBOL(__umoddi3);
-EXPORT_SYMBOL(__udivmoddi4);
 EXPORT_SYMBOL(__udivsi3);
 EXPORT_SYMBOL(__umodsi3);
 EXPORT_SYMBOL(__do_div64);
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index bd4823c74645..1155cf07c871 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -344,9 +344,9 @@ __create_page_tables:
        str     r6, [r0]
 #endif
+#ifdef CONFIG_DEBUG_LL
        bic     r7, r7, #0x0c                   @ turn off cacheable
                                                @ and bufferable bits
-#ifdef CONFIG_DEBUG_LL
        /*
         * Map in IO space for serial debugging.
         * This allows debug messages to be output
@@ -372,28 +372,24 @@ __create_page_tables:
        teq     r1, #MACH_TYPE_NETWINDER
        teqne   r1, #MACH_TYPE_CATS
        bne     1f
-        add     r0, r4, #0x3fc0                 @ ff000000
+        add     r0, r4, #0xff000000 >> 18
-        mov     r3, #0x7c000000
+        orr     r3, r7, #0x7c000000
-        orr     r3, r3, r7
+        str     r3, [r0]
-        str     r3, [r0], #4
-        add     r3, r3, #1 << 20
-        str     r3, [r0], #4
 1:
 #endif
-#endif
 #ifdef CONFIG_ARCH_RPC
        /*
         * Map in screen at 0x02000000 & SCREEN2_BASE
         * Similar reasons here - for debug.  This is
         * only for Acorn RiscPC architectures.
         */
-        add     r0, r4, #0x80                   @ 02000000
+        add     r0, r4, #0x02000000 >> 18
-        mov     r3, #0x02000000
+        orr     r3, r7, #0x02000000
-        orr     r3, r3, r7
        str     r3, [r0]
-        add     r0, r4, #0x3600                 @ d8000000
+        add     r0, r4, #0xd8000000 >> 18
        str     r3, [r0]
 #endif
+#endif
        mov     pc, lr
        .ltorg
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 8cf733daa800..c9b69771f92e 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -359,7 +359,8 @@ void cpu_init(void)
              "I" (offsetof(struct stack, abt[0])),
              "I" (PSR_F_BIT | PSR_I_BIT | UND_MODE),
              "I" (offsetof(struct stack, und[0])),
-              "I" (PSR_F_BIT | PSR_I_BIT | SVC_MODE));
+              "I" (PSR_F_BIT | PSR_I_BIT | SVC_MODE)
+            : "r14");
 }
 static struct machine_desc * __init setup_machine(unsigned int nr)
@@ -736,8 +737,8 @@ void __init setup_arch(char **cmdline_p)
        if (mdesc->soft_reboot)
                reboot_setup("s");
-        if (mdesc->param_offset)
+        if (mdesc->boot_params)
-                tags = phys_to_virt(mdesc->param_offset);
+                tags = phys_to_virt(mdesc->boot_params);
        /*
         * If we have the old style parameters, convert them to
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 34892758f098..a931409c8fe4 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -502,3 +502,126 @@ int __init setup_profiling_timer(unsigned int multiplier)
 {
        return -EINVAL;
 }
+static int
+on_each_cpu_mask(void (*func)(void *), void *info, int retry, int wait,
+                 cpumask_t mask)
+{
+        int ret = 0;
+        preempt_disable();
+        ret = smp_call_function_on_cpu(func, info, retry, wait, mask);
+        if (cpu_isset(smp_processor_id(), mask))
+                func(info);
+        preempt_enable();
+        return ret;
+}
+/**********************************************************************/
+/*
+ * TLB operations
+ */
+struct tlb_args {
+        struct vm_area_struct *ta_vma;
+        unsigned long ta_start;
+        unsigned long ta_end;
+};
+static inline void ipi_flush_tlb_all(void *ignored)
+{
+        local_flush_tlb_all();
+}
+static inline void ipi_flush_tlb_mm(void *arg)
+{
+        struct mm_struct *mm = (struct mm_struct *)arg;
+        local_flush_tlb_mm(mm);
+}
+static inline void ipi_flush_tlb_page(void *arg)
+{
+        struct tlb_args *ta = (struct tlb_args *)arg;
+        local_flush_tlb_page(ta->ta_vma, ta->ta_start);
+}
+static inline void ipi_flush_tlb_kernel_page(void *arg)
+{
+        struct tlb_args *ta = (struct tlb_args *)arg;
+        local_flush_tlb_kernel_page(ta->ta_start);
+}
+static inline void ipi_flush_tlb_range(void *arg)
+{
+        struct tlb_args *ta = (struct tlb_args *)arg;
+        local_flush_tlb_range(ta->ta_vma, ta->ta_start, ta->ta_end);
+}
+static inline void ipi_flush_tlb_kernel_range(void *arg)
+{
+        struct tlb_args *ta = (struct tlb_args *)arg;
+        local_flush_tlb_kernel_range(ta->ta_start, ta->ta_end);
+}
+void flush_tlb_all(void)
+{
+        on_each_cpu(ipi_flush_tlb_all, NULL, 1, 1);
+}
+void flush_tlb_mm(struct mm_struct *mm)
+{
+        cpumask_t mask = mm->cpu_vm_mask;
+        on_each_cpu_mask(ipi_flush_tlb_mm, mm, 1, 1, mask);
+}
+void flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr)
+{
+        cpumask_t mask = vma->vm_mm->cpu_vm_mask;
+        struct tlb_args ta;
+        ta.ta_vma = vma;
+        ta.ta_start = uaddr;
+        on_each_cpu_mask(ipi_flush_tlb_page, &ta, 1, 1, mask);
+}
+void flush_tlb_kernel_page(unsigned long kaddr)
+{
+        struct tlb_args ta;
+        ta.ta_start = kaddr;
+        on_each_cpu(ipi_flush_tlb_kernel_page, &ta, 1, 1);
+}
+void flush_tlb_range(struct vm_area_struct *vma,
+                     unsigned long start, unsigned long end)
+{
+        cpumask_t mask = vma->vm_mm->cpu_vm_mask;
+        struct tlb_args ta;
+        ta.ta_vma = vma;
+        ta.ta_start = start;
+        ta.ta_end = end;
+        on_each_cpu_mask(ipi_flush_tlb_range, &ta, 1, 1, mask);
+}
+void flush_tlb_kernel_range(unsigned long start, unsigned long end)
+{
+        struct tlb_args ta;
+        ta.ta_start = start;
+        ta.ta_end = end;
+        on_each_cpu(ipi_flush_tlb_kernel_range, &ta, 1, 1);
+}
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 2fb0a4cfb37a..df2cb06ce424 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -230,16 +230,8 @@ NORET_TYPE void die(const char *str, struct pt_regs *regs, int err)
        do_exit(SIGSEGV);
 }
-void die_if_kernel(const char *str, struct pt_regs *regs, int err)
+void notify_die(const char *str, struct pt_regs *regs, struct siginfo *info,
-{
+                unsigned long err, unsigned long trap)
-        if (user_mode(regs))
-                return;
-        die(str, regs, err);
-}
-static void notify_die(const char *str, struct pt_regs *regs, siginfo_t *info,
-                       unsigned long err, unsigned long trap)
 {
        if (user_mode(regs)) {
                current->thread.error_code = err;
diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile
index c0e65833ffc4..8725d63e4219 100644
--- a/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
@@ -11,7 +11,7 @@ lib-y		:= backtrace.o changebit.o csumipv6.o csumpartial.o   \
                   strnlen_user.o strchr.o strrchr.o testchangebit.o  \
                   testclearbit.o testsetbit.o uaccess.o getuser.o    \
                   putuser.o ashldi3.o ashrdi3.o lshrdi3.o muldi3.o   \
-                   ucmpdi2.o udivdi3.o lib1funcs.o div64.o            \
+                   ucmpdi2.o lib1funcs.o div64.o                      \
                   io-readsb.o io-writesb.o io-readsl.o io-writesl.o
 ifeq ($(CONFIG_CPU_32v3),y)
diff --git a/arch/arm/lib/longlong.h b/arch/arm/lib/longlong.h
deleted file mode 100644
index 90ae647e4d76..000000000000
--- a/arch/arm/lib/longlong.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/* longlong.h -- based on code from gcc-2.95.3
-   definitions for mixed size 32/64 bit arithmetic.
-   Copyright (C) 1991, 92, 94, 95, 96, 1997, 1998 Free Software Foundation, Inc.
-   This definition file is free software; you can redistribute it
-   and/or modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2, or (at your option) any later version.
-   This definition file is distributed in the hope that it will be
-   useful, but WITHOUT ANY WARRANTY; without even the implied
-   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-   See the GNU General Public License for more details.
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-/* Borrowed from GCC 2.95.3, I Molton 29/07/01 */
-#ifndef SI_TYPE_SIZE
-#define SI_TYPE_SIZE 32
-#endif
-#define __BITS4 (SI_TYPE_SIZE / 4)
-#define __ll_B (1L << (SI_TYPE_SIZE / 2))
-#define __ll_lowpart(t) ((u32) (t) % __ll_B)
-#define __ll_highpart(t) ((u32) (t) / __ll_B)
-/* Define auxiliary asm macros.
-   1) umul_ppmm(high_prod, low_prod, multipler, multiplicand)
-   multiplies two u32 integers MULTIPLER and MULTIPLICAND,
-   and generates a two-part u32 product in HIGH_PROD and
-   LOW_PROD.
-   2) __umulsidi3(a,b) multiplies two u32 integers A and B,
-   and returns a u64 product.  This is just a variant of umul_ppmm.
-   3) udiv_qrnnd(quotient, remainder, high_numerator, low_numerator,
-   denominator) divides a two-word unsigned integer, composed by the
-   integers HIGH_NUMERATOR and LOW_NUMERATOR, by DENOMINATOR and
-   places the quotient in QUOTIENT and the remainder in REMAINDER.
-   HIGH_NUMERATOR must be less than DENOMINATOR for correct operation.
-   If, in addition, the most significant bit of DENOMINATOR must be 1,
-   then the pre-processor symbol UDIV_NEEDS_NORMALIZATION is defined to 1.
-   4) sdiv_qrnnd(quotient, remainder, high_numerator, low_numerator,
-   denominator).  Like udiv_qrnnd but the numbers are signed.  The
-   quotient is rounded towards 0.
-   5) count_leading_zeros(count, x) counts the number of zero-bits from
-   the msb to the first non-zero bit.  This is the number of steps X
-   needs to be shifted left to set the msb.  Undefined for X == 0.
-   6) add_ssaaaa(high_sum, low_sum, high_addend_1, low_addend_1,
-   high_addend_2, low_addend_2) adds two two-word unsigned integers,
-   composed by HIGH_ADDEND_1 and LOW_ADDEND_1, and HIGH_ADDEND_2 and
-   LOW_ADDEND_2 respectively.  The result is placed in HIGH_SUM and
-   LOW_SUM.  Overflow (i.e. carry out) is not stored anywhere, and is
-   lost.
-   7) sub_ddmmss(high_difference, low_difference, high_minuend,
-   low_minuend, high_subtrahend, low_subtrahend) subtracts two
-   two-word unsigned integers, composed by HIGH_MINUEND_1 and
-   LOW_MINUEND_1, and HIGH_SUBTRAHEND_2 and LOW_SUBTRAHEND_2
-   respectively.  The result is placed in HIGH_DIFFERENCE and
-   LOW_DIFFERENCE.  Overflow (i.e. carry out) is not stored anywhere,
-   and is lost.
-   If any of these macros are left undefined for a particular CPU,
-   C macros are used.  */
-#if defined (__arm__)
-#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-  __asm__ ("adds        %1, %4, %5                                      \n\
-        adc     %0, %2, %3"                                             \
-           : "=r" ((u32) (sh)),                                 \
-             "=&r" ((u32) (sl))                                 \
-           : "%r" ((u32) (ah)),                                 \
-             "rI" ((u32) (bh)),                                 \
-             "%r" ((u32) (al)),                                 \
-             "rI" ((u32) (bl)))
-#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-  __asm__ ("subs        %1, %4, %5                                      \n\
-        sbc     %0, %2, %3"                                             \
-           : "=r" ((u32) (sh)),                                 \
-             "=&r" ((u32) (sl))                                 \
-           : "r" ((u32) (ah)),                                  \
-             "rI" ((u32) (bh)),                                 \
-             "r" ((u32) (al)),                                  \
-             "rI" ((u32) (bl)))
-#define umul_ppmm(xh, xl, a, b) \
-{register u32 __t0, __t1, __t2;                                 \
-  __asm__ ("%@ Inlined umul_ppmm                                        \n\
-        mov     %2, %5, lsr #16                                         \n\
-        mov     %0, %6, lsr #16                                         \n\
-        bic     %3, %5, %2, lsl #16                                     \n\
-        bic     %4, %6, %0, lsl #16                                     \n\
-        mul     %1, %3, %4                                              \n\
-        mul     %4, %2, %4                                              \n\
-        mul     %3, %0, %3                                              \n\
-        mul     %0, %2, %0                                              \n\
-        adds    %3, %4, %3                                              \n\
-        addcs   %0, %0, #65536                                          \n\
-        adds    %1, %1, %3, lsl #16                                     \n\
-        adc     %0, %0, %3, lsr #16"                                    \
-           : "=&r" ((u32) (xh)),                                        \
-             "=r" ((u32) (xl)),                                 \
-             "=&r" (__t0), "=&r" (__t1), "=r" (__t2)                    \
-           : "r" ((u32) (a)),                                   \
-             "r" ((u32) (b)));}
-#define UMUL_TIME 20
-#define UDIV_TIME 100
-#endif                          /* __arm__ */
-#define __umulsidi3(u, v) \
-  ({DIunion __w;                                                        \
-    umul_ppmm (__w.s.high, __w.s.low, u, v);                            \
-    __w.ll; })
-#define __udiv_qrnnd_c(q, r, n1, n0, d) \
-  do {                                                                  \
-    u32 __d1, __d0, __q1, __q0;                                 \
-    u32 __r1, __r0, __m;                                                \
-    __d1 = __ll_highpart (d);                                           \
-    __d0 = __ll_lowpart (d);                                            \
-                                                                        \
-    __r1 = (n1) % __d1;                                                 \
-    __q1 = (n1) / __d1;                                                 \
-    __m = (u32) __q1 * __d0;                                    \
-    __r1 = __r1 * __ll_B | __ll_highpart (n0);                          \
-    if (__r1 < __m)                                                     \
-      {                                                                 \
-        __q1--, __r1 += (d);                                            \
-        if (__r1 >= (d)) /* i.e. we didn't get carry when adding to __r1 */\
-          if (__r1 < __m)                                               \
-            __q1--, __r1 += (d);                                        \
-      }                                                                 \
-    __r1 -= __m;                                                        \
-                                                                        \
-    __r0 = __r1 % __d1;                                                 \
-    __q0 = __r1 / __d1;                                                 \
-    __m = (u32) __q0 * __d0;                                    \
-    __r0 = __r0 * __ll_B | __ll_lowpart (n0);                           \
-    if (__r0 < __m)                                                     \
-      {                                                                 \
-        __q0--, __r0 += (d);                                            \
-        if (__r0 >= (d))                                                \
-          if (__r0 < __m)                                               \
-            __q0--, __r0 += (d);                                        \
-      }                                                                 \
-    __r0 -= __m;                                                        \
-                                                                        \
-    (q) = (u32) __q1 * __ll_B | __q0;                           \
-    (r) = __r0;                                                         \
-  } while (0)
-#define UDIV_NEEDS_NORMALIZATION 1
-#define udiv_qrnnd __udiv_qrnnd_c
-#define count_leading_zeros(count, x) \
-  do {                                                                  \
-    u32 __xr = (x);                                                     \
-    u32 __a;                                                    \
-                                                                        \
-    if (SI_TYPE_SIZE <= 32)                                             \
-      {                                                                 \
-        __a = __xr < ((u32)1<<2*__BITS4)                                \
-          ? (__xr < ((u32)1<<__BITS4) ? 0 : __BITS4)            \
-          : (__xr < ((u32)1<<3*__BITS4) ?  2*__BITS4 : 3*__BITS4);      \
-      }                                                                 \
-    else                                                                \
-      {                                                                 \
-        for (__a = SI_TYPE_SIZE - 8; __a > 0; __a -= 8)                 \
-          if (((__xr >> __a) & 0xff) != 0)                              \
-            break;                                                      \
-      }                                                                 \
-                                                                        \
-    (count) = SI_TYPE_SIZE - (__clz_tab[__xr >> __a] + __a);            \
-  } while (0)
diff --git a/arch/arm/lib/udivdi3.c b/arch/arm/lib/udivdi3.c
deleted file mode 100644
index e343be4c6642..000000000000
--- a/arch/arm/lib/udivdi3.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/* More subroutines needed by GCC output code on some machines.  */
-/* Compile this one with gcc.  */
-/* Copyright (C) 1989, 92-98, 1999 Free Software Foundation, Inc.
-This file is part of GNU CC.
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-/* As a special exception, if you link this library with other files,
-   some of which are compiled with GCC, to produce an executable,
-   this library does not by itself cause the resulting executable
-   to be covered by the GNU General Public License.
-   This exception does not however invalidate any other reasons why
-   the executable file might be covered by the GNU General Public License.
- */
-/* support functions required by the kernel. based on code from gcc-2.95.3 */
-/* I Molton     29/07/01 */
-#include "gcclib.h"
-#include "longlong.h"
-static const u8 __clz_tab[] = {
-        0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5,
-            5, 5, 5, 5, 5, 5, 5, 5,
-        6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-            6, 6, 6, 6, 6, 6, 6, 6,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-            7, 7, 7, 7, 7, 7, 7, 7,
-        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-            7, 7, 7, 7, 7, 7, 7, 7,
-        8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8,
-        8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8,
-        8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8,
-        8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-            8, 8, 8, 8, 8, 8, 8, 8,
-};
-u64 __udivmoddi4(u64 n, u64 d, u64 * rp)
-{
-        DIunion ww;
-        DIunion nn, dd;
-        DIunion rr;
-        u32 d0, d1, n0, n1, n2;
-        u32 q0, q1;
-        u32 b, bm;
-        nn.ll = n;
-        dd.ll = d;
-        d0 = dd.s.low;
-        d1 = dd.s.high;
-        n0 = nn.s.low;
-        n1 = nn.s.high;
-        if (d1 == 0) {
-                if (d0 > n1) {
-                        /* 0q = nn / 0D */
-                        count_leading_zeros(bm, d0);
-                        if (bm != 0) {
-                                /* Normalize, i.e. make the most significant bit of the
-                                   denominator set.  */
-                                d0 = d0 << bm;
-                                n1 = (n1 << bm) | (n0 >> (SI_TYPE_SIZE - bm));
-                                n0 = n0 << bm;
-                        }
-                        udiv_qrnnd(q0, n0, n1, n0, d0);
-                        q1 = 0;
-                        /* Remainder in n0 >> bm.  */
-                } else {
-                        /* qq = NN / 0d */
-                        if (d0 == 0)
-                                d0 = 1 / d0;    /* Divide intentionally by zero.  */
-                        count_leading_zeros(bm, d0);
-                        if (bm == 0) {
-                                /* From (n1 >= d0) /\ (the most significant bit of d0 is set),
-                                   conclude (the most significant bit of n1 is set) /\ (the
-                                   leading quotient digit q1 = 1).
-                                   This special case is necessary, not an optimization.
-                                   (Shifts counts of SI_TYPE_SIZE are undefined.)  */
-                                n1 -= d0;
-                                q1 = 1;
-                        } else {
-                                /* Normalize.  */
-                                b = SI_TYPE_SIZE - bm;
-                                d0 = d0 << bm;
-                                n2 = n1 >> b;
-                                n1 = (n1 << bm) | (n0 >> b);
-                                n0 = n0 << bm;
-                                udiv_qrnnd(q1, n1, n2, n1, d0);
-                        }
-                        /* n1 != d0...  */
-                        udiv_qrnnd(q0, n0, n1, n0, d0);
-                        /* Remainder in n0 >> bm.  */
-                }
-                if (rp != 0) {
-                        rr.s.low = n0 >> bm;
-                        rr.s.high = 0;
-                        *rp = rr.ll;
-                }
-        } else {
-                if (d1 > n1) {
-                        /* 00 = nn / DD */
-                        q0 = 0;
-                        q1 = 0;
-                        /* Remainder in n1n0.  */
-                        if (rp != 0) {
-                                rr.s.low = n0;
-                                rr.s.high = n1;
-                                *rp = rr.ll;
-                        }
-                } else {
-                        /* 0q = NN / dd */
-                        count_leading_zeros(bm, d1);
-                        if (bm == 0) {
-                                /* From (n1 >= d1) /\ (the most significant bit of d1 is set),
-                                   conclude (the most significant bit of n1 is set) /\ (the
-                                   quotient digit q0 = 0 or 1).
-                                   This special case is necessary, not an optimization.  */
-                                /* The condition on the next line takes advantage of that
-                                   n1 >= d1 (true due to program flow).  */
-                                if (n1 > d1 || n0 >= d0) {
-                                        q0 = 1;
-                                        sub_ddmmss(n1, n0, n1, n0, d1, d0);
-                                } else
-                                        q0 = 0;
-                                q1 = 0;
-                                if (rp != 0) {
-                                        rr.s.low = n0;
-                                        rr.s.high = n1;
-                                        *rp = rr.ll;
-                                }
-                        } else {
-                                u32 m1, m0;
-                                /* Normalize.  */
-                                b = SI_TYPE_SIZE - bm;
-                                d1 = (d1 << bm) | (d0 >> b);
-                                d0 = d0 << bm;
-                                n2 = n1 >> b;
-                                n1 = (n1 << bm) | (n0 >> b);
-                                n0 = n0 << bm;
-                                udiv_qrnnd(q0, n1, n2, n1, d1);
-                                umul_ppmm(m1, m0, q0, d0);
-                                if (m1 > n1 || (m1 == n1 && m0 > n0)) {
-                                        q0--;
-                                        sub_ddmmss(m1, m0, m1, m0, d1, d0);
-                                }
-                                q1 = 0;
-                                /* Remainder in (n1n0 - m1m0) >> bm.  */
-                                if (rp != 0) {
-                                        sub_ddmmss(n1, n0, n1, n0, m1, m0);
-                                        rr.s.low = (n1 << b) | (n0 >> bm);
-                                        rr.s.high = n1 >> bm;
-                                        *rp = rr.ll;
-                                }
-                        }
-                }
-        }
-        ww.s.low = q0;
-        ww.s.high = q1;
-        return ww.ll;
-}
-u64 __udivdi3(u64 n, u64 d)
-{
-        return __udivmoddi4(n, d, (u64 *) 0);
-}
-u64 __umoddi3(u64 u, u64 v)
-{
-        u64 w;
-        (void)__udivmoddi4(u, v, &w);
-        return w;
-}
diff --git a/arch/arm/mach-aaec2000/aaed2000.c b/arch/arm/mach-aaec2000/aaed2000.c
index 5417ca3f4621..c9d899886648 100644
--- a/arch/arm/mach-aaec2000/aaed2000.c
+++ b/arch/arm/mach-aaec2000/aaed2000.c
@@ -40,9 +40,11 @@ static void __init aaed2000_map_io(void)
 }
 MACHINE_START(AAED2000, "Agilent AAED-2000 Development Platform")
-        MAINTAINER("Nicolas Bellido Y Ortega")
+        /* Maintainer: Nicolas Bellido Y Ortega */
-        BOOT_MEM(0xf0000000, PIO_BASE, VIO_BASE)
+        .phys_ram       = 0xf0000000,
-        MAPIO(aaed2000_map_io)
+        .phys_io        = PIO_BASE,
-        INITIRQ(aaed2000_init_irq)
+        .io_pg_offst    = ((VIO_BASE) >> 18) & 0xfffc,
+        .map_io         = aaed2000_map_io,
+        .init_irq       = aaed2000_init_irq,
        .timer          = &aaec2000_timer,
 MACHINE_END
diff --git a/arch/arm/mach-clps711x/autcpu12.c b/arch/arm/mach-clps711x/autcpu12.c
index c106704a2c34..dc73feb1ffb0 100644
--- a/arch/arm/mach-clps711x/autcpu12.c
+++ b/arch/arm/mach-clps711x/autcpu12.c
@@ -59,11 +59,13 @@ void __init autcpu12_map_io(void)
 }
 MACHINE_START(AUTCPU12, "autronix autcpu12")
-        MAINTAINER("Thomas Gleixner")
+        /* Maintainer: Thomas Gleixner */
-        BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0020000)
+        .phys_io        = 0x80000000,
-        MAPIO(autcpu12_map_io)
+        .io_pg_offst    = ((0xff000000) >> 18) & 0xfffc,
-        INITIRQ(clps711x_init_irq)
+        .boot_params    = 0xc0020000,
+        .map_io         = autcpu12_map_io,
+        .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END
diff --git a/arch/arm/mach-clps711x/cdb89712.c b/arch/arm/mach-clps711x/cdb89712.c
index 7664f9cf83b8..a46c82cd2711 100644
--- a/arch/arm/mach-clps711x/cdb89712.c
+++ b/arch/arm/mach-clps711x/cdb89712.c
@@ -49,10 +49,12 @@ static void __init cdb89712_map_io(void)
 }
 MACHINE_START(CDB89712, "Cirrus-CDB89712")
-        MAINTAINER("Ray Lehtiniemi")
+        /* Maintainer: Ray Lehtiniemi */
-        BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        MAPIO(cdb89712_map_io)
+        .io_pg_offst    = ((0xff000000) >> 18) & 0xfffc,
-        INITIRQ(clps711x_init_irq)
+        .boot_params    = 0xc0000100,
+        .map_io         = cdb89712_map_io,
+        .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END
diff --git a/arch/arm/mach-clps711x/ceiva.c b/arch/arm/mach-clps711x/ceiva.c
index e4093be3c4cb..780d91805984 100644
--- a/arch/arm/mach-clps711x/ceiva.c
+++ b/arch/arm/mach-clps711x/ceiva.c
@@ -53,10 +53,12 @@ static void __init ceiva_map_io(void)
 MACHINE_START(CEIVA, "CEIVA/Polaroid Photo MAX Digital Picture Frame")
-        MAINTAINER("Rob Scott")
+        /* Maintainer: Rob Scott */
-        BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        MAPIO(ceiva_map_io)
+        .io_pg_offst    = ((0xff000000) >> 18) & 0xfffc,
-        INITIRQ(clps711x_init_irq)
+        .boot_params    = 0xc0000100,
+        .map_io         = ceiva_map_io,
+        .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END
diff --git a/arch/arm/mach-clps711x/clep7312.c b/arch/arm/mach-clps711x/clep7312.c
index 9ca21cb481ba..c83f3fd68fcd 100644
--- a/arch/arm/mach-clps711x/clep7312.c
+++ b/arch/arm/mach-clps711x/clep7312.c
@@ -37,12 +37,14 @@ fixup_clep7312(struct machine_desc *desc, struct tag *tags,
 MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312")
-        MAINTAINER("Nobody")
+        /* Maintainer: Nobody */
-        BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        FIXUP(fixup_clep7312)
+        .io_pg_offst    = ((0xff000000) >> 18) & 0xfffc,
-        MAPIO(clps711x_map_io)
+        .boot_params    = 0xc0000100,
-        INITIRQ(clps711x_init_irq)
+        .fixup          = fixup_clep7312,
+        .map_io         = clps711x_map_io,
+        .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END
diff --git a/arch/arm/mach-clps711x/edb7211-arch.c b/arch/arm/mach-clps711x/edb7211-arch.c
index c6c46324a2e3..255c98b63e15 100644
--- a/arch/arm/mach-clps711x/edb7211-arch.c
+++ b/arch/arm/mach-clps711x/edb7211-arch.c
@@ -51,11 +51,13 @@ fixup_edb7211(struct machine_desc *desc, struct tag *tags,
 }
 MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)")
-        MAINTAINER("Jon McClintock")
+        /* Maintainer: Jon McClintock */
-        BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0020100) /* 0xc0000000 - 0xc001ffff can be video RAM */
+        .phys_io        = 0x80000000,
-        FIXUP(fixup_edb7211)
+        .io_pg_offst    = ((0xff000000) >> 18) & 0xfffc,
-        MAPIO(edb7211_map_io)
+        .boot_params    = 0xc0020100,   /* 0xc0000000 - 0xc001ffff can be video RAM */
-        INITIRQ(clps711x_init_irq)
+        .fixup          = fixup_edb7211,
+        .map_io         = edb7211_map_io,
+        .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END
diff --git a/arch/arm/mach-clps711x/fortunet.c b/arch/arm/mach-clps711x/fortunet.c
index c1c5b8e01549..f83a59761e02 100644
--- a/arch/arm/mach-clps711x/fortunet.c
+++ b/arch/arm/mach-clps711x/fortunet.c
@@ -75,11 +75,13 @@ fortunet_fixup(struct machine_desc *desc, struct tag *tags,
 }
 MACHINE_START(FORTUNET, "ARM-FortuNet")
-        MAINTAINER("FortuNet Inc.")
+        /* Maintainer: FortuNet Inc. */
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf0000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0x00000000)
+        .phys_io        = 0x80000000,
-        FIXUP(fortunet_fixup)
+        .io_pg_offst    = ((0xf0000000) >> 18) & 0xfffc,
-        MAPIO(clps711x_map_io)
+        .boot_params    = 0x00000000,
-        INITIRQ(clps711x_init_irq)
+        .fixup          = fortunet_fixup,
+        .map_io         = clps711x_map_io,
+        .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END
diff --git a/arch/arm/mach-clps711x/p720t.c b/arch/arm/mach-clps711x/p720t.c
index 29269df054f5..5bdb90edf992 100644
--- a/arch/arm/mach-clps711x/p720t.c
+++ b/arch/arm/mach-clps711x/p720t.c
@@ -79,12 +79,14 @@ static void __init p720t_map_io(void)
 }
 MACHINE_START(P720T, "ARM-Prospector720T")
-        MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
+        /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
-        BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        FIXUP(fixup_p720t)
+        .io_pg_offst    = ((0xff000000) >> 18) & 0xfffc,
-        MAPIO(p720t_map_io)
+        .boot_params    = 0xc0000100,
-        INITIRQ(clps711x_init_irq)
+        .fixup          = fixup_p720t,
+        .map_io         = p720t_map_io,
+        .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END
diff --git a/arch/arm/mach-clps7500/core.c b/arch/arm/mach-clps7500/core.c
index 90e85f434f6f..112f1d68fb2b 100644
--- a/arch/arm/mach-clps7500/core.c
+++ b/arch/arm/mach-clps7500/core.c
@@ -366,11 +366,13 @@ static void __init clps7500_init(void)
 }
 MACHINE_START(CLPS7500, "CL-PS7500")
-        MAINTAINER("Philip Blundell")
+        /* Maintainer: Philip Blundell */
-        BOOT_MEM(0x10000000, 0x03000000, 0xe0000000)
+        .phys_ram       = 0x10000000,
-        MAPIO(clps7500_map_io)
+        .phys_io        = 0x03000000,
-        INITIRQ(clps7500_init_irq)
+        .io_pg_offst    = ((0xe0000000) >> 18) & 0xfffc,
-                .init_machine   = clps7500_init,
+        .map_io         = clps7500_map_io,
-                .timer          = &clps7500_timer,
+        .init_irq       = clps7500_init_irq,
+        .init_machine   = clps7500_init,
+        .timer          = &clps7500_timer,
 MACHINE_END
diff --git a/arch/arm/mach-ebsa110/core.c b/arch/arm/mach-ebsa110/core.c
index 86ffdbb5626e..23c4da10101b 100644
--- a/arch/arm/mach-ebsa110/core.c
+++ b/arch/arm/mach-ebsa110/core.c
@@ -233,13 +233,15 @@ static int __init ebsa110_init(void)
 arch_initcall(ebsa110_init);
 MACHINE_START(EBSA110, "EBSA110")
-        MAINTAINER("Russell King")
+        /* Maintainer: Russell King */
-        BOOT_MEM(0x00000000, 0xe0000000, 0xe0000000)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000400)
+        .phys_io        = 0xe0000000,
-        DISABLE_PARPORT(0)
+        .io_pg_offst    = ((0xe0000000) >> 18) & 0xfffc,
-        DISABLE_PARPORT(2)
+        .boot_params    = 0x00000400,
-        SOFT_REBOOT
+        .reserve_lp0    = 1,
-        MAPIO(ebsa110_map_io)
+        .reserve_lp2    = 1,
-        INITIRQ(ebsa110_init_irq)
+        .soft_reboot    = 1,
+        .map_io         = ebsa110_map_io,
+        .init_irq       = ebsa110_init_irq,
        .timer          = &ebsa110_timer,
 MACHINE_END
diff --git a/arch/arm/mach-epxa10db/arch.c b/arch/arm/mach-epxa10db/arch.c
index 1b40340e8a21..7daa021676d0 100644
--- a/arch/arm/mach-epxa10db/arch.c
+++ b/arch/arm/mach-epxa10db/arch.c
@@ -63,10 +63,12 @@ extern void epxa10db_init_irq(void);
 extern struct sys_timer epxa10db_timer;
 MACHINE_START(CAMELOT, "Altera Epxa10db")
-        MAINTAINER("Altera Corporation")
+        /* Maintainer: Altera Corporation */
-        BOOT_MEM(0x00000000, 0x7fffc000, 0xffffc000)
+        .phys_ram       = 0x00000000,
-        MAPIO(epxa10db_map_io)
+        .phys_io        = 0x7fffc000,
-        INITIRQ(epxa10db_init_irq)
+        .io_pg_offst    = ((0xffffc000) >> 18) & 0xfffc,
+        .map_io         = epxa10db_map_io,
+        .init_irq       = epxa10db_init_irq,
        .timer          = &epxa10db_timer,
 MACHINE_END
diff --git a/arch/arm/mach-footbridge/cats-hw.c b/arch/arm/mach-footbridge/cats-hw.c
index d1ced86c379c..49b898af0032 100644
--- a/arch/arm/mach-footbridge/cats-hw.c
+++ b/arch/arm/mach-footbridge/cats-hw.c
@@ -84,12 +84,14 @@ fixup_cats(struct machine_desc *desc, struct tag *tags,
 }
 MACHINE_START(CATS, "Chalice-CATS")
-        MAINTAINER("Philip Blundell")
+        /* Maintainer: Philip Blundell */
-        BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = DC21285_ARMCSR_BASE,
-        SOFT_REBOOT
+        .io_pg_offst    = ((0xfe000000) >> 18) & 0xfffc,
-        FIXUP(fixup_cats)
+        .boot_params    = 0x00000100,
-        MAPIO(footbridge_map_io)
+        .soft_reboot    = 1,
-        INITIRQ(footbridge_init_irq)
+        .fixup          = fixup_cats,
+        .map_io         = footbridge_map_io,
+        .init_irq       = footbridge_init_irq,
        .timer          = &isa_timer,
 MACHINE_END
diff --git a/arch/arm/mach-footbridge/co285.c b/arch/arm/mach-footbridge/co285.c
index e1541914fdcd..548a79081688 100644
--- a/arch/arm/mach-footbridge/co285.c
+++ b/arch/arm/mach-footbridge/co285.c
@@ -28,11 +28,13 @@ fixup_coebsa285(struct machine_desc *desc, struct tag *tags,
 }
 MACHINE_START(CO285, "co-EBSA285")
-        MAINTAINER("Mark van Doesburg")
+        /* Maintainer: Mark van Doesburg */
-        BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0x7cf00000)
+        .phys_ram       = 0x00000000,
-        FIXUP(fixup_coebsa285)
+        .phys_io        = DC21285_ARMCSR_BASE,
-        MAPIO(footbridge_map_io)
+        .io_pg_offst    = ((0x7cf00000) >> 18) & 0xfffc,
-        INITIRQ(footbridge_init_irq)
+        .fixup          = fixup_coebsa285,
+        .map_io         = footbridge_map_io,
+        .init_irq       = footbridge_init_irq,
        .timer          = &footbridge_timer,
 MACHINE_END
diff --git a/arch/arm/mach-footbridge/ebsa285.c b/arch/arm/mach-footbridge/ebsa285.c
index d0931f5a63c8..1c37605268d5 100644
--- a/arch/arm/mach-footbridge/ebsa285.c
+++ b/arch/arm/mach-footbridge/ebsa285.c
@@ -13,12 +13,15 @@
 #include "common.h"
 MACHINE_START(EBSA285, "EBSA285")
-        MAINTAINER("Russell King")
+        /* Maintainer: Russell King */
-        BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = DC21285_ARMCSR_BASE,
-        VIDEO(0x000a0000, 0x000bffff)
+        .io_pg_offst    = ((0xfe000000) >> 18) & 0xfffc,
-        MAPIO(footbridge_map_io)
+        .boot_params    = 0x00000100,
-        INITIRQ(footbridge_init_irq)
+        .video_start    = 0x000a0000,
+        .video_end      = 0x000bffff,
+        .map_io         = footbridge_map_io,
+        .init_irq       = footbridge_init_irq,
        .timer          = &footbridge_timer,
 MACHINE_END
diff --git a/arch/arm/mach-footbridge/netwinder-hw.c b/arch/arm/mach-footbridge/netwinder-hw.c
index 1e1dfd79f4fe..775f85fc8513 100644
--- a/arch/arm/mach-footbridge/netwinder-hw.c
+++ b/arch/arm/mach-footbridge/netwinder-hw.c
@@ -647,14 +647,17 @@ fixup_netwinder(struct machine_desc *desc, struct tag *tags,
 }
 MACHINE_START(NETWINDER, "Rebel-NetWinder")
-        MAINTAINER("Russell King/Rebel.com")
+        /* Maintainer: Russell King/Rebel.com */
-        BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = DC21285_ARMCSR_BASE,
-        VIDEO(0x000a0000, 0x000bffff)
+        .io_pg_offst    = ((0xfe000000) >> 18) & 0xfffc,
-        DISABLE_PARPORT(0)
+        .boot_params    = 0x00000100,
-        DISABLE_PARPORT(2)
+        .video_start    = 0x000a0000,
-        FIXUP(fixup_netwinder)
+        .video_end      = 0x000bffff,
-        MAPIO(footbridge_map_io)
+        .reserve_lp0    = 1,
-        INITIRQ(footbridge_init_irq)
+        .reserve_lp2    = 1,
+        .fixup          = fixup_netwinder,
+        .map_io         = footbridge_map_io,
+        .init_irq       = footbridge_init_irq,
        .timer          = &isa_timer,
 MACHINE_END
diff --git a/arch/arm/mach-footbridge/personal.c b/arch/arm/mach-footbridge/personal.c
index 415086d7bbee..0146b8bb59da 100644
--- a/arch/arm/mach-footbridge/personal.c
+++ b/arch/arm/mach-footbridge/personal.c
@@ -13,11 +13,13 @@
 #include "common.h"
 MACHINE_START(PERSONAL_SERVER, "Compaq-PersonalServer")
-        MAINTAINER("Jamey Hicks / George France")
+        /* Maintainer: Jamey Hicks / George France */
-        BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = DC21285_ARMCSR_BASE,
-        MAPIO(footbridge_map_io)
+        .io_pg_offst    = ((0xfe000000) >> 18) & 0xfffc,
-        INITIRQ(footbridge_init_irq)
+        .boot_params    = 0x00000100,
+        .map_io         = footbridge_map_io,
+        .init_irq       = footbridge_init_irq,
        .timer          = &footbridge_timer,
 MACHINE_END
diff --git a/arch/arm/mach-h720x/h7201-eval.c b/arch/arm/mach-h720x/h7201-eval.c
index 9b24b9b0db15..fa59e9e2a5c8 100644
--- a/arch/arm/mach-h720x/h7201-eval.c
+++ b/arch/arm/mach-h720x/h7201-eval.c
@@ -30,10 +30,12 @@
 #include "common.h"
 MACHINE_START(H7201, "Hynix GMS30C7201")
-        MAINTAINER("Robert Schwebel, Pengutronix")
+        /* Maintainer: Robert Schwebel, Pengutronix */
-        BOOT_MEM(0x40000000, 0x80000000, 0xf0000000)
+        .phys_ram       = 0x40000000,
-        BOOT_PARAMS(0xc0001000)
+        .phys_io        = 0x80000000,
-        MAPIO(h720x_map_io)
+        .io_pg_offst    = ((0xf0000000) >> 18) & 0xfffc,
-        INITIRQ(h720x_init_irq)
+        .boot_params    = 0xc0001000,
-        .timer = &h7201_timer,
+        .map_io         = h720x_map_io,
+        .init_irq       = h720x_init_irq,
+        .timer          = &h7201_timer,
 MACHINE_END
diff --git a/arch/arm/mach-h720x/h7202-eval.c b/arch/arm/mach-h720x/h7202-eval.c
index 3456a00d5f5c..db9078ad008c 100644
--- a/arch/arm/mach-h720x/h7202-eval.c
+++ b/arch/arm/mach-h720x/h7202-eval.c
@@ -71,11 +71,13 @@ static void __init init_eval_h7202(void)
 }
 MACHINE_START(H7202, "Hynix HMS30C7202")
-        MAINTAINER("Robert Schwebel, Pengutronix")
+        /* Maintainer: Robert Schwebel, Pengutronix */
-        BOOT_MEM(0x40000000, 0x80000000, 0xf0000000)
+        .phys_ram       = 0x40000000,
-        BOOT_PARAMS(0x40000100)
+        .phys_io        = 0x80000000,
-        MAPIO(h720x_map_io)
+        .io_pg_offst    = ((0xf0000000) >> 18) & 0xfffc,
-        INITIRQ(h7202_init_irq)
+        .boot_params    = 0x40000100,
-        .timer = &h7202_timer,
+        .map_io         = h720x_map_io,
-        INIT_MACHINE(init_eval_h7202)
+        .init_irq       = h7202_init_irq,
+        .timer          = &h7202_timer,
+        .init_machine   = init_eval_h7202,
 MACHINE_END
diff --git a/arch/arm/mach-imx/mx1ads.c b/arch/arm/mach-imx/mx1ads.c
index 625dd01c2578..5d25434d332c 100644
--- a/arch/arm/mach-imx/mx1ads.c
+++ b/arch/arm/mach-imx/mx1ads.c
@@ -78,11 +78,13 @@ mx1ads_map_io(void)
 }
 MACHINE_START(MX1ADS, "Motorola MX1ADS")
-        MAINTAINER("Sascha Hauer, Pengutronix")
+        /* Maintainer: Sascha Hauer, Pengutronix */
-        BOOT_MEM(0x08000000, 0x00200000, 0xe0200000)
+        .phys_ram       = 0x08000000,
-        BOOT_PARAMS(0x08000100)
+        .phys_io        = 0x00200000,
-        MAPIO(mx1ads_map_io)
+        .io_pg_offst    = ((0xe0200000) >> 18) & 0xfffc,
-        INITIRQ(imx_init_irq)
+        .boot_params    = 0x08000100,
+        .map_io         = mx1ads_map_io,
+        .init_irq       = imx_init_irq,
        .timer          = &imx_timer,
-        INIT_MACHINE(mx1ads_init)
+        .init_machine   = mx1ads_init,
 MACHINE_END
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c
index 9222e57bd872..dacbf504dae2 100644
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
@@ -20,6 +20,7 @@
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/hardware/amba.h>
+#include <asm/hardware/arm_timer.h>
 #include <asm/arch/cm.h>
 #include <asm/system.h>
 #include <asm/leds.h>
@@ -156,16 +157,6 @@ EXPORT_SYMBOL(cm_control);
 #define TICKS2USECS(x)  ((x) / TICKS_PER_uSEC)
 #endif
-/*
- * What does it look like?
- */
-typedef struct TimerStruct {
-        unsigned long TimerLoad;
-        unsigned long TimerValue;
-        unsigned long TimerControl;
-        unsigned long TimerClear;
-} TimerStruct_t;
 static unsigned long timer_reload;
 /*
@@ -174,7 +165,6 @@ static unsigned long timer_reload;
 */
 unsigned long integrator_gettimeoffset(void)
 {
-        volatile TimerStruct_t *timer1 = (TimerStruct_t *)TIMER1_VA_BASE;
        unsigned long ticks1, ticks2, status;
        /*
@@ -183,11 +173,11 @@ unsigned long integrator_gettimeoffset(void)
         * an interrupt.  We get around this by ensuring that the
         * counter has not reloaded between our two reads.
         */
-        ticks2 = timer1->TimerValue & 0xffff;
+        ticks2 = readl(TIMER1_VA_BASE + TIMER_VALUE) & 0xffff;
        do {
                ticks1 = ticks2;
                status = __raw_readl(VA_IC_BASE + IRQ_RAW_STATUS);
-                ticks2 = timer1->TimerValue & 0xffff;
+                ticks2 = readl(TIMER1_VA_BASE + TIMER_VALUE) & 0xffff;
        } while (ticks2 > ticks1);
        /*
@@ -213,14 +203,12 @@ unsigned long integrator_gettimeoffset(void)
 static irqreturn_t
 integrator_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
-        volatile TimerStruct_t *timer1 = (volatile TimerStruct_t *)TIMER1_VA_BASE;
        write_seqlock(&xtime_lock);
        /*
         * clear the interrupt
         */
-        timer1->TimerClear = 1;
+        writel(1, TIMER1_VA_BASE + TIMER_INTCLR);
        /*
         * the clock tick routines are only processed on the
@@ -256,32 +244,29 @@ static struct irqaction integrator_timer_irq = {
 */
 void __init integrator_time_init(unsigned long reload, unsigned int ctrl)
 {
-        volatile TimerStruct_t *timer0 = (volatile TimerStruct_t *)TIMER0_VA_BASE;
+        unsigned int timer_ctrl = TIMER_CTRL_ENABLE | TIMER_CTRL_PERIODIC;
-        volatile TimerStruct_t *timer1 = (volatile TimerStruct_t *)TIMER1_VA_BASE;
-        volatile TimerStruct_t *timer2 = (volatile TimerStruct_t *)TIMER2_VA_BASE;
-        unsigned int timer_ctrl = 0x80 | 0x40;  /* periodic */
        timer_reload = reload;
        timer_ctrl |= ctrl;
        if (timer_reload > 0x100000) {
                timer_reload >>= 8;
-                timer_ctrl |= 0x08; /* /256 */
+                timer_ctrl |= TIMER_CTRL_DIV256;
        } else if (timer_reload > 0x010000) {
                timer_reload >>= 4;
-                timer_ctrl |= 0x04; /* /16 */
+                timer_ctrl |= TIMER_CTRL_DIV16;
        }
        /*
         * Initialise to a known state (all timers off)
         */
-        timer0->TimerControl = 0;
+        writel(0, TIMER0_VA_BASE + TIMER_CTRL);
-        timer1->TimerControl = 0;
+        writel(0, TIMER1_VA_BASE + TIMER_CTRL);
-        timer2->TimerControl = 0;
+        writel(0, TIMER2_VA_BASE + TIMER_CTRL);
-        timer1->TimerLoad    = timer_reload;
+        writel(timer_reload, TIMER1_VA_BASE + TIMER_LOAD);
-        timer1->TimerValue   = timer_reload;
+        writel(timer_reload, TIMER1_VA_BASE + TIMER_VALUE);
-        timer1->TimerControl = timer_ctrl;
+        writel(timer_ctrl, TIMER1_VA_BASE + TIMER_CTRL);
        /*
         * Make irqs happen for the system timer
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index 91ba9fd79c87..36e2b6eb67b7 100644
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -292,11 +292,13 @@ static struct sys_timer ap_timer = {
 };
 MACHINE_START(INTEGRATOR, "ARM-Integrator")
-        MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
+        /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
-        BOOT_MEM(0x00000000, 0x16000000, 0xf1600000)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = 0x16000000,
-        MAPIO(ap_map_io)
+        .io_pg_offst    = ((0xf1600000) >> 18) & 0xfffc,
-        INITIRQ(ap_init_irq)
+        .boot_params    = 0x00000100,
+        .map_io         = ap_map_io,
+        .init_irq       = ap_init_irq,
        .timer          = &ap_timer,
-        INIT_MACHINE(ap_init)
+        .init_machine   = ap_init,
 MACHINE_END
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index e0a01eef0993..569f328c479d 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -532,11 +532,13 @@ static struct sys_timer cp_timer = {
 };
 MACHINE_START(CINTEGRATOR, "ARM-IntegratorCP")
-        MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
+        /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
-        BOOT_MEM(0x00000000, 0x16000000, 0xf1600000)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = 0x16000000,
-        MAPIO(intcp_map_io)
+        .io_pg_offst    = ((0xf1600000) >> 18) & 0xfffc,
-        INITIRQ(intcp_init_irq)
+        .boot_params    = 0x00000100,
+        .map_io         = intcp_map_io,
+        .init_irq       = intcp_init_irq,
        .timer          = &cp_timer,
-        INIT_MACHINE(intcp_init)
+        .init_machine   = intcp_init,
 MACHINE_END
diff --git a/arch/arm/mach-iop3xx/iop321-setup.c b/arch/arm/mach-iop3xx/iop321-setup.c
index bf23e0fd2843..0f921ba2750c 100644
--- a/arch/arm/mach-iop3xx/iop321-setup.c
+++ b/arch/arm/mach-iop3xx/iop321-setup.c
@@ -146,23 +146,27 @@ extern void iop321_init_time(void);
 #if defined(CONFIG_ARCH_IQ80321)
 MACHINE_START(IQ80321, "Intel IQ80321")
-        MAINTAINER("Intel Corporation")
+        /* Maintainer: Intel Corporation */
-        BOOT_MEM(PHYS_OFFSET, IQ80321_UART, IQ80321_UART)
+        .phys_ram       = PHYS_OFFSET,
-        MAPIO(iq80321_map_io)
+        .phys_io        = IQ80321_UART,
-        INITIRQ(iop321_init_irq)
+        .io_pg_offst    = ((IQ80321_UART) >> 18) & 0xfffc,
+        .map_io         = iq80321_map_io,
+        .init_irq       = iop321_init_irq,
        .timer          = &iop321_timer,
-    BOOT_PARAMS(0xa0000100)
+        .boot_params    = 0xa0000100,
-        INIT_MACHINE(iop32x_init)
+        .init_machine   = iop32x_init,
 MACHINE_END
 #elif defined(CONFIG_ARCH_IQ31244)
 MACHINE_START(IQ31244, "Intel IQ31244")
-    MAINTAINER("Intel Corp.")
+        /* Maintainer: Intel Corp. */
-    BOOT_MEM(PHYS_OFFSET, IQ31244_UART, IQ31244_UART)
+        .phys_ram       = PHYS_OFFSET,
-    MAPIO(iq31244_map_io)
+        .phys_io        = IQ31244_UART,
-    INITIRQ(iop321_init_irq)
+        .io_pg_offst    = ((IQ31244_UART) >> 18) & 0xfffc,
+        .map_io         = iq31244_map_io,
+        .init_irq       = iop321_init_irq,
        .timer          = &iop321_timer,
-    BOOT_PARAMS(0xa0000100)
+        .boot_params    = 0xa0000100,
-        INIT_MACHINE(iop32x_init)
+        .init_machine   = iop32x_init,
 MACHINE_END
 #else
 #error No machine descriptor defined for this IOP3XX implementation
diff --git a/arch/arm/mach-iop3xx/iop331-setup.c b/arch/arm/mach-iop3xx/iop331-setup.c
index 622e7914819a..fc74b722f72f 100644
--- a/arch/arm/mach-iop3xx/iop331-setup.c
+++ b/arch/arm/mach-iop3xx/iop331-setup.c
@@ -148,26 +148,28 @@ extern void iq80332_map_io(void);
 #if defined(CONFIG_ARCH_IQ80331)
 MACHINE_START(IQ80331, "Intel IQ80331")
-    MAINTAINER("Intel Corp.")
+        /* Maintainer: Intel Corp. */
-    BOOT_MEM(PHYS_OFFSET, 0xfefff000, 0xfffff000) // virtual, physical
+        .phys_ram       = PHYS_OFFSET,
-    //BOOT_MEM(PHYS_OFFSET, IOP331_UART0_VIRT, IOP331_UART0_PHYS)
+        .phys_io        = 0xfefff000,
-    MAPIO(iq80331_map_io)
+        .io_pg_offst    = ((0xfffff000) >> 18) & 0xfffc, // virtual, physical
-    INITIRQ(iop331_init_irq)
+        .map_io         = iq80331_map_io,
+        .init_irq       = iop331_init_irq,
        .timer          = &iop331_timer,
-    BOOT_PARAMS(0x0100)
+        .boot_params    = 0x0100,
-        INIT_MACHINE(iop33x_init)
+        .init_machine   = iop33x_init,
 MACHINE_END
 #elif defined(CONFIG_MACH_IQ80332)
 MACHINE_START(IQ80332, "Intel IQ80332")
-    MAINTAINER("Intel Corp.")
+        /* Maintainer: Intel Corp. */
-    BOOT_MEM(PHYS_OFFSET, 0xfefff000, 0xfffff000) // virtual, physical
+        .phys_ram       = PHYS_OFFSET,
-    //BOOT_MEM(PHYS_OFFSET, IOP331_UART0_VIRT, IOP331_UART0_PHYS)
+        .phys_io        = 0xfefff000,
-    MAPIO(iq80332_map_io)
+        .io_pg_offst    = ((0xfffff000) >> 18) & 0xfffc, // virtual, physical
-    INITIRQ(iop331_init_irq)
+        .map_io         = iq80332_map_io,
+        .init_irq       = iop331_init_irq,
        .timer          = &iop331_timer,
-    BOOT_PARAMS(0x0100)
+        .boot_params    = 0x0100,
-        INIT_MACHINE(iop33x_init)
+        .init_machine   = iop33x_init,
 MACHINE_END
 #else
diff --git a/arch/arm/mach-ixp2000/enp2611.c b/arch/arm/mach-ixp2000/enp2611.c
index f3a291b6a9fb..b7ebf3898fc5 100644
--- a/arch/arm/mach-ixp2000/enp2611.c
+++ b/arch/arm/mach-ixp2000/enp2611.c
@@ -223,13 +223,15 @@ static void __init enp2611_init_machine(void)
 MACHINE_START(ENP2611, "Radisys ENP-2611 PCI network processor board")
-        MAINTAINER("Lennert Buytenhek <buytenh@wantstofly.org>")
+        /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */
-        BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = IXP2000_UART_PHYS_BASE,
-        MAPIO(ixp2000_map_io)
+        .io_pg_offst    = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
-        INITIRQ(ixp2000_init_irq)
+        .boot_params    = 0x00000100,
+        .map_io         = ixp2000_map_io,
+        .init_irq       = ixp2000_init_irq,
        .timer          = &enp2611_timer,
-        INIT_MACHINE(enp2611_init_machine)
+        .init_machine   = enp2611_init_machine,
 MACHINE_END
diff --git a/arch/arm/mach-ixp2000/ixdp2400.c b/arch/arm/mach-ixp2000/ixdp2400.c
index df3ff26c8cdd..fd280a93637e 100644
--- a/arch/arm/mach-ixp2000/ixdp2400.c
+++ b/arch/arm/mach-ixp2000/ixdp2400.c
@@ -168,12 +168,14 @@ void ixdp2400_init_irq(void)
 }
 MACHINE_START(IXDP2400, "Intel IXDP2400 Development Platform")
-        MAINTAINER("MontaVista Software, Inc.")
+        /* Maintainer: MontaVista Software, Inc. */
-        BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = IXP2000_UART_PHYS_BASE,
-        MAPIO(ixdp2x00_map_io)
+        .io_pg_offst    = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
-        INITIRQ(ixdp2400_init_irq)
+        .boot_params    = 0x00000100,
+        .map_io         = ixdp2x00_map_io,
+        .init_irq       = ixdp2400_init_irq,
        .timer          = &ixdp2400_timer,
-        INIT_MACHINE(ixdp2x00_init_machine)
+        .init_machine   = ixdp2x00_init_machine,
 MACHINE_END
diff --git a/arch/arm/mach-ixp2000/ixdp2800.c b/arch/arm/mach-ixp2000/ixdp2800.c
index 468a4bbfb724..f9073aa28615 100644
--- a/arch/arm/mach-ixp2000/ixdp2800.c
+++ b/arch/arm/mach-ixp2000/ixdp2800.c
@@ -284,12 +284,14 @@ void ixdp2800_init_irq(void)
 }
 MACHINE_START(IXDP2800, "Intel IXDP2800 Development Platform")
-        MAINTAINER("MontaVista Software, Inc.")
+        /* Maintainer: MontaVista Software, Inc. */
-        BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = IXP2000_UART_PHYS_BASE,
-        MAPIO(ixdp2x00_map_io)
+        .io_pg_offst    = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
-        INITIRQ(ixdp2800_init_irq)
+        .boot_params    = 0x00000100,
+        .map_io         = ixdp2x00_map_io,
+        .init_irq       = ixdp2800_init_irq,
        .timer          = &ixdp2800_timer,
-        INIT_MACHINE(ixdp2x00_init_machine)
+        .init_machine   = ixdp2x00_init_machine,
 MACHINE_END
diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c
index e94dace3d412..c73588743ee1 100644
--- a/arch/arm/mach-ixp2000/ixdp2x01.c
+++ b/arch/arm/mach-ixp2000/ixdp2x01.c
@@ -375,25 +375,29 @@ static void __init ixdp2x01_init_machine(void)
 #ifdef CONFIG_ARCH_IXDP2401
 MACHINE_START(IXDP2401, "Intel IXDP2401 Development Platform")
-        MAINTAINER("MontaVista Software, Inc.")
+        /* Maintainer: MontaVista Software, Inc. */
-        BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = IXP2000_UART_PHYS_BASE,
-        MAPIO(ixdp2x01_map_io)
+        .io_pg_offst    = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
-        INITIRQ(ixdp2x01_init_irq)
+        .boot_params    = 0x00000100,
+        .map_io         = ixdp2x01_map_io,
+        .init_irq       = ixdp2x01_init_irq,
        .timer          = &ixdp2x01_timer,
-        INIT_MACHINE(ixdp2x01_init_machine)
+        .init_machine   = ixdp2x01_init_machine,
 MACHINE_END
 #endif
 #ifdef CONFIG_ARCH_IXDP2801
 MACHINE_START(IXDP2801, "Intel IXDP2801 Development Platform")
-        MAINTAINER("MontaVista Software, Inc.")
+        /* Maintainer: MontaVista Software, Inc. */
-        BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = IXP2000_UART_PHYS_BASE,
-        MAPIO(ixdp2x01_map_io)
+        .io_pg_offst    = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
-        INITIRQ(ixdp2x01_init_irq)
+        .boot_params    = 0x00000100,
+        .map_io         = ixdp2x01_map_io,
+        .init_irq       = ixdp2x01_init_irq,
        .timer          = &ixdp2x01_timer,
-        INIT_MACHINE(ixdp2x01_init_machine)
+        .init_machine   = ixdp2x01_init_machine,
 MACHINE_END
 #endif
diff --git a/arch/arm/mach-ixp4xx/common-pci.c b/arch/arm/mach-ixp4xx/common-pci.c
index aa92e3708838..2b544363c078 100644
--- a/arch/arm/mach-ixp4xx/common-pci.c
+++ b/arch/arm/mach-ixp4xx/common-pci.c
@@ -453,8 +453,8 @@ int ixp4xx_setup(int nr, struct pci_sys_data *sys)
        local_write_config(PCI_COMMAND, 2, PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY);
        res[0].name = "PCI I/O Space";
-        res[0].start = 0x00001000;
+        res[0].start = 0x00000000;
-        res[0].end = 0xffff0000;
+        res[0].end = 0x0000ffff;
        res[0].flags = IORESOURCE_IO;
        res[1].name = "PCI Memory Space";
diff --git a/arch/arm/mach-ixp4xx/coyote-setup.c b/arch/arm/mach-ixp4xx/coyote-setup.c
index 8a05a1227e5f..4ff4393ef0ea 100644
--- a/arch/arm/mach-ixp4xx/coyote-setup.c
+++ b/arch/arm/mach-ixp4xx/coyote-setup.c
@@ -56,21 +56,24 @@ static struct resource coyote_uart_resource = {
        .flags  = IORESOURCE_MEM,
 };
-static struct plat_serial8250_port coyote_uart_data = {
+static struct plat_serial8250_port coyote_uart_data[] = {
-        .mapbase        = IXP4XX_UART2_BASE_PHYS,
+        {
-        .membase        = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
+                .mapbase        = IXP4XX_UART2_BASE_PHYS,
-        .irq            = IRQ_IXP4XX_UART2,
+                .membase        = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
-        .flags          = UPF_BOOT_AUTOCONF,
+                .irq            = IRQ_IXP4XX_UART2,
-        .iotype         = UPIO_MEM,
+                .flags          = UPF_BOOT_AUTOCONF,
-        .regshift       = 2,
+                .iotype         = UPIO_MEM,
-        .uartclk        = IXP4XX_UART_XTAL,
+                .regshift       = 2,
+                .uartclk        = IXP4XX_UART_XTAL,
+        },
+        { },
 };
 static struct platform_device coyote_uart = {
        .name           = "serial8250",
        .id             = 0,
        .dev                    = {
-                .platform_data  = &coyote_uart_data,
+                .platform_data  = coyote_uart_data,
        },
        .num_resources  = 1,
        .resource       = &coyote_uart_resource,
@@ -87,10 +90,10 @@ static void __init coyote_init(void)
        *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0;
        if (machine_is_ixdpg425()) {
-                coyote_uart_data.membase =
+                coyote_uart_data[0].membase =
                        (char*)(IXP4XX_UART1_BASE_VIRT + REG_OFFSET);
-                coyote_uart_data.mapbase = IXP4XX_UART1_BASE_PHYS;
+                coyote_uart_data[0].mapbase = IXP4XX_UART1_BASE_PHYS;
-                coyote_uart_data.irq = IRQ_IXP4XX_UART1;
+                coyote_uart_data[0].irq = IRQ_IXP4XX_UART1;
        }
@@ -100,14 +103,15 @@ static void __init coyote_init(void)
 #ifdef CONFIG_ARCH_ADI_COYOTE
 MACHINE_START(ADI_COYOTE, "ADI Engineering Coyote")
-        MAINTAINER("MontaVista Software, Inc.")
+        /* Maintainer: MontaVista Software, Inc. */
-        BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
+        .phys_ram       = PHYS_OFFSET,
-                IXP4XX_PERIPHERAL_BASE_VIRT)
+        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
-        MAPIO(coyote_map_io)
+        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
-        INITIRQ(ixp4xx_init_irq)
+        .map_io         = coyote_map_io,
+        .init_irq       = ixp4xx_init_irq,
        .timer          = &ixp4xx_timer,
-        BOOT_PARAMS(0x0100)
+        .boot_params    = 0x0100,
-        INIT_MACHINE(coyote_init)
+        .init_machine   = coyote_init,
 MACHINE_END
 #endif
@@ -117,14 +121,15 @@ MACHINE_END
 */
 #ifdef CONFIG_MACH_IXDPG425
 MACHINE_START(IXDPG425, "Intel IXDPG425")
-        MAINTAINER("MontaVista Software, Inc.")
+        /* Maintainer: MontaVista Software, Inc. */
-        BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
+        .phys_ram       = PHYS_OFFSET,
-                IXP4XX_PERIPHERAL_BASE_VIRT)
+        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
-        MAPIO(coyote_map_io)
+        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
-        INITIRQ(ixp4xx_init_irq)
+        .map_io         = coyote_map_io,
+        .init_irq       = ixp4xx_init_irq,
        .timer          = &ixp4xx_timer,
-        BOOT_PARAMS(0x0100)
+        .boot_params    = 0x0100,
-        INIT_MACHINE(coyote_init)
+        .init_machine   = coyote_init,
 MACHINE_END
 #endif
diff --git a/arch/arm/mach-ixp4xx/gtwx5715-setup.c b/arch/arm/mach-ixp4xx/gtwx5715-setup.c
index e77c86efd21d..8ba1cd9406e7 100644
--- a/arch/arm/mach-ixp4xx/gtwx5715-setup.c
+++ b/arch/arm/mach-ixp4xx/gtwx5715-setup.c
@@ -140,14 +140,15 @@ static void __init gtwx5715_init(void)
 MACHINE_START(GTWX5715, "Gemtek GTWX5715 (Linksys WRV54G)")
-        MAINTAINER("George Joseph")
+        /* Maintainer: George Joseph */
-        BOOT_MEM(PHYS_OFFSET, IXP4XX_UART2_BASE_PHYS,
+        .phys_ram       = PHYS_OFFSET,
-                IXP4XX_UART2_BASE_VIRT)
+        .phys_io        = IXP4XX_UART2_BASE_PHYS,
-        MAPIO(gtwx5715_map_io)
+        .io_pg_offst    = ((IXP4XX_UART2_BASE_VIRT) >> 18) & 0xfffc,
-        INITIRQ(ixp4xx_init_irq)
+        .map_io         = gtwx5715_map_io,
-                  .timer                = &ixp4xx_timer,
+        .init_irq       = ixp4xx_init_irq,
-        BOOT_PARAMS(0x0100)
+        .timer          = &ixp4xx_timer,
-        INIT_MACHINE(gtwx5715_init)
+        .boot_params    = 0x0100,
+        .init_machine   = gtwx5715_init,
 MACHINE_END
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c
index 77346c1f676b..c2ba759e9946 100644
--- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
@@ -95,7 +95,8 @@ static struct plat_serial8250_port ixdp425_uart_data[] = {
                .iotype         = UPIO_MEM,
                .regshift       = 2,
                .uartclk        = IXP4XX_UART_XTAL,
-        }
+        },
+        { },
 };
 static struct platform_device ixdp425_uart = {
@@ -128,36 +129,39 @@ static void __init ixdp425_init(void)
 }
 MACHINE_START(IXDP425, "Intel IXDP425 Development Platform")
-        MAINTAINER("MontaVista Software, Inc.")
+        /* Maintainer: MontaVista Software, Inc. */
-        BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
+        .phys_ram       = PHYS_OFFSET,
-                IXP4XX_PERIPHERAL_BASE_VIRT)
+        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
-        MAPIO(ixdp425_map_io)
+        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
-        INITIRQ(ixp4xx_init_irq)
+        .map_io         = ixdp425_map_io,
+        .init_irq       = ixp4xx_init_irq,
        .timer          = &ixp4xx_timer,
-        BOOT_PARAMS(0x0100)
+        .boot_params    = 0x0100,
-        INIT_MACHINE(ixdp425_init)
+        .init_machine   = ixdp425_init,
 MACHINE_END
 MACHINE_START(IXDP465, "Intel IXDP465 Development Platform")
-        MAINTAINER("MontaVista Software, Inc.")
+        /* Maintainer: MontaVista Software, Inc. */
-        BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
+        .phys_ram       = PHYS_OFFSET,
-                IXP4XX_PERIPHERAL_BASE_VIRT)
+        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
-        MAPIO(ixdp425_map_io)
+        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
-        INITIRQ(ixp4xx_init_irq)
+        .map_io         = ixdp425_map_io,
+        .init_irq       = ixp4xx_init_irq,
        .timer          = &ixp4xx_timer,
-        BOOT_PARAMS(0x0100)
+        .boot_params    = 0x0100,
-        INIT_MACHINE(ixdp425_init)
+        .init_machine   = ixdp425_init,
 MACHINE_END
 MACHINE_START(IXCDP1100, "Intel IXCDP1100 Development Platform")
-        MAINTAINER("MontaVista Software, Inc.")
+        /* Maintainer: MontaVista Software, Inc. */
-        BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
+        .phys_ram       = PHYS_OFFSET,
-                IXP4XX_PERIPHERAL_BASE_VIRT)
+        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
-        MAPIO(ixdp425_map_io)
+        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
-        INITIRQ(ixp4xx_init_irq)
+        .map_io         = ixdp425_map_io,
+        .init_irq       = ixp4xx_init_irq,
        .timer          = &ixp4xx_timer,
-        BOOT_PARAMS(0x0100)
+        .boot_params    = 0x0100,
-        INIT_MACHINE(ixdp425_init)
+        .init_machine   = ixdp425_init,
 MACHINE_END
 /*
@@ -168,14 +172,15 @@ MACHINE_END
 */
 #ifdef CONFIG_ARCH_AVILA
 MACHINE_START(AVILA, "Gateworks Avila Network Platform")
-        MAINTAINER("Deepak Saxena <dsaxena@plexity.net>")
+        /* Maintainer: Deepak Saxena <dsaxena@plexity.net> */
-        BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
+        .phys_ram       = PHYS_OFFSET,
-                IXP4XX_PERIPHERAL_BASE_VIRT)
+        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
-        MAPIO(ixdp425_map_io)
+        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
-        INITIRQ(ixp4xx_init_irq)
+        .map_io         = ixdp425_map_io,
+        .init_irq       = ixp4xx_init_irq,
        .timer          = &ixp4xx_timer,
-        BOOT_PARAMS(0x0100)
+        .boot_params    = 0x0100,
-        INIT_MACHINE(ixdp425_init)
+        .init_machine   = ixdp425_init,
 MACHINE_END
 #endif
diff --git a/arch/arm/mach-l7200/core.c b/arch/arm/mach-l7200/core.c
index 606ca95f8217..2a7fee2a7635 100644
--- a/arch/arm/mach-l7200/core.c
+++ b/arch/arm/mach-l7200/core.c
@@ -81,9 +81,11 @@ static void __init l7200_map_io(void)
 }
 MACHINE_START(L7200, "LinkUp Systems L7200")
-        MAINTAINER("Steve Hill / Scott McConnell")
+        /* Maintainer: Steve Hill / Scott McConnell */
-        BOOT_MEM(0xf0000000, 0x80040000, 0xd0000000)
+        .phys_ram       = 0xf0000000,
-        MAPIO(l7200_map_io)
+        .phys_io        = 0x80040000,
-        INITIRQ(l7200_init_irq)
+        .io_pg_offst    = ((0xd0000000) >> 18) & 0xfffc,
+        .map_io         = l7200_map_io,
+        .init_irq       = l7200_init_irq,
 MACHINE_END
diff --git a/arch/arm/mach-lh7a40x/arch-kev7a400.c b/arch/arm/mach-lh7a40x/arch-kev7a400.c
index be5d17fe9dcb..cb3dcd3bd00a 100644
--- a/arch/arm/mach-lh7a40x/arch-kev7a400.c
+++ b/arch/arm/mach-lh7a40x/arch-kev7a400.c
@@ -102,10 +102,12 @@ void __init lh7a40x_init_board_irq (void)
 }
 MACHINE_START (KEV7A400, "Sharp KEV7a400")
-        MAINTAINER ("Marc Singer")
+        /* Maintainer: Marc Singer */
-        BOOT_MEM (0xc0000000, 0x80000000, io_p2v (0x80000000))
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS (0xc0000100)
+        .phys_io        = 0x80000000,
-        MAPIO (kev7a400_map_io)
+        .io_pg_offst    = ((io_p2v (0x80000000))>>18) & 0xfffc,
-        INITIRQ (lh7a400_init_irq)
+        .boot_params    = 0xc0000100,
+        .map_io         = kev7a400_map_io,
+        .init_irq       = lh7a400_init_irq,
        .timer          = &lh7a40x_timer,
 MACHINE_END
diff --git a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
index c823447a150f..6eb61a17c63b 100644
--- a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
+++ b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
@@ -260,13 +260,15 @@ lpd7a400_map_io(void)
 #ifdef CONFIG_MACH_LPD7A400
 MACHINE_START (LPD7A400, "Logic Product Development LPD7A400-10")
-        MAINTAINER ("Marc Singer")
+        /* Maintainer: Marc Singer */
-        BOOT_MEM (0xc0000000, 0x80000000, io_p2v (0x80000000))
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS (0xc0000100)
+        .phys_io        = 0x80000000,
-        MAPIO (lpd7a400_map_io)
+        .io_pg_offst    = ((io_p2v (0x80000000))>>18) & 0xfffc,
-        INITIRQ (lh7a400_init_irq)
+        .boot_params    = 0xc0000100,
+        .map_io         = lpd7a400_map_io,
+        .init_irq       = lh7a400_init_irq,
        .timer          = &lh7a40x_timer,
-        INIT_MACHINE (lpd7a40x_init)
+        .init_machine   = lpd7a40x_init,
 MACHINE_END
 #endif
@@ -274,13 +276,15 @@ MACHINE_END
 #ifdef CONFIG_MACH_LPD7A404
 MACHINE_START (LPD7A404, "Logic Product Development LPD7A404-10")
-        MAINTAINER ("Marc Singer")
+        /* Maintainer: Marc Singer */
-        BOOT_MEM (0xc0000000, 0x80000000, io_p2v (0x80000000))
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS (0xc0000100)
+        .phys_io        = 0x80000000,
-        MAPIO (lpd7a400_map_io)
+        .io_pg_offst    = ((io_p2v (0x80000000))>>18) & 0xfffc,
-        INITIRQ (lh7a404_init_irq)
+        .boot_params    = 0xc0000100,
+        .map_io         = lpd7a400_map_io,
+        .init_irq       = lh7a404_init_irq,
        .timer          = &lh7a40x_timer,
-        INIT_MACHINE (lpd7a40x_init)
+        .init_machine   = lpd7a40x_init,
 MACHINE_END
 #endif
diff --git a/arch/arm/mach-omap/board-generic.c b/arch/arm/mach-omap/board-generic.c
index 2102a2cd1013..384bc7cec1db 100644
--- a/arch/arm/mach-omap/board-generic.c
+++ b/arch/arm/mach-omap/board-generic.c
@@ -88,11 +88,13 @@ static void __init omap_generic_map_io(void)
 }
 MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710")
-        MAINTAINER("Tony Lindgren <tony@atomide.com>")
+        /* Maintainer: Tony Lindgren <tony@atomide.com> */
-        BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
+        .phys_ram       = 0x10000000,
-        BOOT_PARAMS(0x10000100)
+        .phys_io        = 0xfff00000,
-        MAPIO(omap_generic_map_io)
+        .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
-        INITIRQ(omap_generic_init_irq)
+        .boot_params    = 0x10000100,
-        INIT_MACHINE(omap_generic_init)
+        .map_io         = omap_generic_map_io,
+        .init_irq       = omap_generic_init_irq,
+        .init_machine   = omap_generic_init,
        .timer          = &omap_timer,
 MACHINE_END
diff --git a/arch/arm/mach-omap/board-h2.c b/arch/arm/mach-omap/board-h2.c
index 1f067830d1fc..f37c76a9b163 100644
--- a/arch/arm/mach-omap/board-h2.c
+++ b/arch/arm/mach-omap/board-h2.c
@@ -177,11 +177,13 @@ static void __init h2_map_io(void)
 }
 MACHINE_START(OMAP_H2, "TI-H2")
-        MAINTAINER("Imre Deak <imre.deak@nokia.com>")
+        /* Maintainer: Imre Deak <imre.deak@nokia.com> */
-        BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
+        .phys_ram       = 0x10000000,
-        BOOT_PARAMS(0x10000100)
+        .phys_io        = 0xfff00000,
-        MAPIO(h2_map_io)
+        .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
-        INITIRQ(h2_init_irq)
+        .boot_params    = 0x10000100,
-        INIT_MACHINE(h2_init)
+        .map_io         = h2_map_io,
+        .init_irq       = h2_init_irq,
+        .init_machine   = h2_init,
        .timer          = &omap_timer,
 MACHINE_END
diff --git a/arch/arm/mach-omap/board-h3.c b/arch/arm/mach-omap/board-h3.c
index 486a5a006c9a..705e48594e9a 100644
--- a/arch/arm/mach-omap/board-h3.c
+++ b/arch/arm/mach-omap/board-h3.c
@@ -195,11 +195,13 @@ static void __init h3_map_io(void)
 }
 MACHINE_START(OMAP_H3, "TI OMAP1710 H3 board")
-        MAINTAINER("Texas Instruments, Inc.")
+        /* Maintainer: Texas Instruments, Inc. */
-        BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
+        .phys_ram       = 0x10000000,
-        BOOT_PARAMS(0x10000100)
+        .phys_io        = 0xfff00000,
-        MAPIO(h3_map_io)
+        .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
-        INITIRQ(h3_init_irq)
+        .boot_params    = 0x10000100,
-        INIT_MACHINE(h3_init)
+        .map_io         = h3_map_io,
+        .init_irq       = h3_init_irq,
+        .init_machine   = h3_init,
        .timer          = &omap_timer,
 MACHINE_END
diff --git a/arch/arm/mach-omap/board-innovator.c b/arch/arm/mach-omap/board-innovator.c
index 57cf4da88d55..523363f18cc0 100644
--- a/arch/arm/mach-omap/board-innovator.c
+++ b/arch/arm/mach-omap/board-innovator.c
@@ -270,11 +270,13 @@ static void __init innovator_map_io(void)
 }
 MACHINE_START(OMAP_INNOVATOR, "TI-Innovator")
-        MAINTAINER("MontaVista Software, Inc.")
+        /* Maintainer: MontaVista Software, Inc. */
-        BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
+        .phys_ram       = 0x10000000,
-        BOOT_PARAMS(0x10000100)
+        .phys_io        = 0xfff00000,
-        MAPIO(innovator_map_io)
+        .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
-        INITIRQ(innovator_init_irq)
+        .boot_params    = 0x10000100,
-        INIT_MACHINE(innovator_init)
+        .map_io         = innovator_map_io,
+        .init_irq       = innovator_init_irq,
+        .init_machine   = innovator_init,
        .timer          = &omap_timer,
 MACHINE_END
diff --git a/arch/arm/mach-omap/board-netstar.c b/arch/arm/mach-omap/board-netstar.c
index 54acbd215c4b..8c653734d5a3 100644
--- a/arch/arm/mach-omap/board-netstar.c
+++ b/arch/arm/mach-omap/board-netstar.c
@@ -141,11 +141,13 @@ static int __init netstar_late_init(void)
 postcore_initcall(netstar_late_init);
 MACHINE_START(NETSTAR, "NetStar OMAP5910")
-        MAINTAINER("Ladislav Michl <michl@2n.cz>")
+        /* Maintainer: Ladislav Michl <michl@2n.cz> */
-        BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
+        .phys_ram       = 0x10000000,
-        BOOT_PARAMS(0x10000100)
+        .phys_io        = 0xfff00000,
-        MAPIO(netstar_map_io)
+        .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
-        INITIRQ(netstar_init_irq)
+        .boot_params    = 0x10000100,
-        INIT_MACHINE(netstar_init)
+        .map_io         = netstar_map_io,
-        .timer = &omap_timer,
+        .init_irq       = netstar_init_irq,
+        .init_machine   = netstar_init,
+        .timer          = &omap_timer,
 MACHINE_END
diff --git a/arch/arm/mach-omap/board-osk.c b/arch/arm/mach-omap/board-osk.c
index a951fc82459b..cb433436aa08 100644
--- a/arch/arm/mach-omap/board-osk.c
+++ b/arch/arm/mach-omap/board-osk.c
@@ -159,11 +159,13 @@ static void __init osk_map_io(void)
 }
 MACHINE_START(OMAP_OSK, "TI-OSK")
-        MAINTAINER("Dirk Behme <dirk.behme@de.bosch.com>")
+        /* Maintainer: Dirk Behme <dirk.behme@de.bosch.com> */
-        BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
+        .phys_ram       = 0x10000000,
-        BOOT_PARAMS(0x10000100)
+        .phys_io        = 0xfff00000,
-        MAPIO(osk_map_io)
+        .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
-        INITIRQ(osk_init_irq)
+        .boot_params    = 0x10000100,
-        INIT_MACHINE(osk_init)
+        .map_io         = osk_map_io,
+        .init_irq       = osk_init_irq,
+        .init_machine   = osk_init,
        .timer          = &omap_timer,
 MACHINE_END
diff --git a/arch/arm/mach-omap/board-perseus2.c b/arch/arm/mach-omap/board-perseus2.c
index 64515aeb49cf..d5342043d48f 100644
--- a/arch/arm/mach-omap/board-perseus2.c
+++ b/arch/arm/mach-omap/board-perseus2.c
@@ -179,11 +179,13 @@ static void __init omap_perseus2_map_io(void)
 }
 MACHINE_START(OMAP_PERSEUS2, "OMAP730 Perseus2")
-        MAINTAINER("Kevin Hilman <kjh@hilman.org>")
+        /* Maintainer: Kevin Hilman <kjh@hilman.org> */
-        BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
+        .phys_ram       = 0x10000000,
-        BOOT_PARAMS(0x10000100)
+        .phys_io        = 0xfff00000,
-        MAPIO(omap_perseus2_map_io)
+        .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
-        INITIRQ(omap_perseus2_init_irq)
+        .boot_params    = 0x10000100,
-        INIT_MACHINE(omap_perseus2_init)
+        .map_io         = omap_perseus2_map_io,
+        .init_irq       = omap_perseus2_init_irq,
+        .init_machine   = omap_perseus2_init,
        .timer          = &omap_timer,
 MACHINE_END
diff --git a/arch/arm/mach-omap/board-voiceblue.c b/arch/arm/mach-omap/board-voiceblue.c
index f1a5bffac666..6b0c5003d719 100644
--- a/arch/arm/mach-omap/board-voiceblue.c
+++ b/arch/arm/mach-omap/board-voiceblue.c
@@ -246,11 +246,13 @@ EXPORT_SYMBOL(voiceblue_wdt_disable);
 EXPORT_SYMBOL(voiceblue_wdt_ping);
 MACHINE_START(VOICEBLUE, "VoiceBlue OMAP5910")
-        MAINTAINER("Ladislav Michl <michl@2n.cz>")
+        /* Maintainer: Ladislav Michl <michl@2n.cz> */
-        BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
+        .phys_ram       = 0x10000000,
-        BOOT_PARAMS(0x10000100)
+        .phys_io        = 0xfff00000,
-        MAPIO(voiceblue_map_io)
+        .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
-        INITIRQ(voiceblue_init_irq)
+        .boot_params    = 0x10000100,
-        INIT_MACHINE(voiceblue_init)
+        .map_io         = voiceblue_map_io,
-        .timer = &omap_timer,
+        .init_irq       = voiceblue_init_irq,
+        .init_machine   = voiceblue_init,
+        .timer          = &omap_timer,
 MACHINE_END
diff --git a/arch/arm/mach-omap/pm.c b/arch/arm/mach-omap/pm.c
index 00fac155df2a..6b03ccdc1e92 100644
--- a/arch/arm/mach-omap/pm.c
+++ b/arch/arm/mach-omap/pm.c
@@ -41,7 +41,9 @@
 #include <linux/pm.h>
 #include <asm/io.h>
+#include <asm/mach/time.h>
 #include <asm/mach-types.h>
 #include <asm/arch/omap16xx.h>
 #include <asm/arch/pm.h>
 #include <asm/arch/mux.h>
@@ -80,13 +82,13 @@ void omap_pm_idle(void)
                return;
        }
        mask32 = omap_readl(ARM_SYSST);
-        local_fiq_enable();
-        local_irq_enable();
-#if defined(CONFIG_OMAP_32K_TIMER) && defined(CONFIG_NO_IDLE_HZ)
+        /*
-        /* Override timer to use VST for the next cycle */
+         * Since an interrupt may set up a timer, we don't want to
-        omap_32k_timer_next_vst_interrupt();
+         * reprogram the hardware timer with interrupts enabled.
-#endif
+         * Re-enable interrupts only after returning from idle.
+         */
+        timer_dyn_reprogram();
        if ((mask32 & DSP_IDLE) == 0) {
                __asm__ volatile ("mcr  p15, 0, r0, c7, c0, 4");
@@ -102,6 +104,8 @@ void omap_pm_idle(void)
                func_ptr();
        }
+        local_fiq_enable();
+        local_irq_enable();
 }
 /*
diff --git a/arch/arm/mach-omap/time.c b/arch/arm/mach-omap/time.c
index 589e8b2740dd..dd34e9f4c413 100644
--- a/arch/arm/mach-omap/time.c
+++ b/arch/arm/mach-omap/time.c
@@ -4,7 +4,7 @@
 * OMAP Timers
 *
 * Copyright (C) 2004 Nokia Corporation
- * Partial timer rewrite and additional VST timer support by
+ * Partial timer rewrite and additional dynamic tick timer support by
 * Tony Lindgen <tony@atomide.com> and
 * Tuukka Tikkanen <tuukka.tikkanen@elektrobit.com>
 *
@@ -261,7 +261,6 @@ unsigned long long sched_clock(void)
 * so with HZ = 100, TVR = 327.68.
 */
 #define OMAP_32K_TIMER_TICK_PERIOD      ((32768 / HZ) - 1)
-#define MAX_SKIP_JIFFIES                25
 #define TIMER_32K_SYNCHRONIZED          0xfffbc410
 #define JIFFIES_TO_HW_TICKS(nr_jiffies, clock_rate)                     \
@@ -347,6 +346,42 @@ static irqreturn_t omap_32k_timer_interrupt(int irq, void *dev_id,
        return IRQ_HANDLED;
 }
+#ifdef CONFIG_NO_IDLE_HZ
+/*
+ * Programs the next timer interrupt needed. Called when dynamic tick is
+ * enabled, and to reprogram the ticks to skip from pm_idle. Note that
+ * we can keep the timer continuous, and don't need to set it to run in
+ * one-shot mode. This is because the timer will get reprogrammed again
+ * after next interrupt.
+ */
+void omap_32k_timer_reprogram(unsigned long next_tick)
+{
+        omap_32k_timer_start(JIFFIES_TO_HW_TICKS(next_tick, 32768) + 1);
+}
+static struct irqaction omap_32k_timer_irq;
+extern struct timer_update_handler timer_update;
+static int omap_32k_timer_enable_dyn_tick(void)
+{
+        /* No need to reprogram timer, just use the next interrupt */
+        return 0;
+}
+static int omap_32k_timer_disable_dyn_tick(void)
+{
+        omap_32k_timer_start(OMAP_32K_TIMER_TICK_PERIOD);
+        return 0;
+}
+static struct dyn_tick_timer omap_dyn_tick_timer = {
+        .enable         = omap_32k_timer_enable_dyn_tick,
+        .disable        = omap_32k_timer_disable_dyn_tick,
+        .reprogram      = omap_32k_timer_reprogram,
+        .handler        = omap_32k_timer_interrupt,
+};
+#endif  /* CONFIG_NO_IDLE_HZ */
 static struct irqaction omap_32k_timer_irq = {
        .name           = "32KHz timer",
        .flags          = SA_INTERRUPT | SA_TIMER,
@@ -355,6 +390,11 @@ static struct irqaction omap_32k_timer_irq = {
 static __init void omap_init_32k_timer(void)
 {
+#ifdef CONFIG_NO_IDLE_HZ
+        omap_timer.dyn_tick = &omap_dyn_tick_timer;
+#endif
        setup_irq(INT_OS_TIMER, &omap_32k_timer_irq);
        omap_timer.offset  = omap_32k_timer_gettimeoffset;
        omap_32k_last_tick = omap_32k_sync_timer_read();
diff --git a/arch/arm/mach-omap/usb.c b/arch/arm/mach-omap/usb.c
index 7f37857b1a28..fd483ff9f8fe 100644
--- a/arch/arm/mach-omap/usb.c
+++ b/arch/arm/mach-omap/usb.c
@@ -41,7 +41,6 @@
 /* These routines should handle the standard chip-specific modes
 * for usb0/1/2 ports, covering basic mux and transceiver setup.
- * Call omap_usb_init() once, from INIT_MACHINE().
 *
 * Some board-*.c files will need to set up additional mux options,
 * like for suspend handling, vbus sensing, GPIOs, and the D+ pullup.
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile
index c4e6d2523585..efc2f657184e 100644
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@ -24,3 +24,7 @@ obj-$(CONFIG_LEDS) += $(led-y)
 # Misc features
 obj-$(CONFIG_PM) += pm.o sleep.o
+ifeq ($(CONFIG_PXA27x),y)
+obj-$(CONFIG_PM) += standby.o
+endif
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c
index f691cf77d390..86b862f56e7e 100644
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
@@ -287,34 +287,40 @@ static void __init corgi_map_io(void)
 #ifdef CONFIG_MACH_CORGI
 MACHINE_START(CORGI, "SHARP Corgi")
-        BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
+        .phys_ram       = 0xa0000000,
-        FIXUP(fixup_corgi)
+        .phys_io        = 0x40000000,
-        MAPIO(corgi_map_io)
+        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
-        INITIRQ(corgi_init_irq)
+        .fixup          = fixup_corgi,
-        .init_machine = corgi_init,
+        .map_io         = corgi_map_io,
-        .timer = &pxa_timer,
+        .init_irq       = corgi_init_irq,
+        .init_machine   = corgi_init,
+        .timer          = &pxa_timer,
 MACHINE_END
 #endif
 #ifdef CONFIG_MACH_SHEPHERD
 MACHINE_START(SHEPHERD, "SHARP Shepherd")
-        BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
+        .phys_ram       = 0xa0000000,
-        FIXUP(fixup_corgi)
+        .phys_io        = 0x40000000,
-        MAPIO(corgi_map_io)
+        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
-        INITIRQ(corgi_init_irq)
+        .fixup          = fixup_corgi,
-        .init_machine = corgi_init,
+        .map_io         = corgi_map_io,
-        .timer = &pxa_timer,
+        .init_irq       = corgi_init_irq,
+        .init_machine   = corgi_init,
+        .timer          = &pxa_timer,
 MACHINE_END
 #endif
 #ifdef CONFIG_MACH_HUSKY
 MACHINE_START(HUSKY, "SHARP Husky")
-        BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
+        .phys_ram       = 0xa0000000,
-        FIXUP(fixup_corgi)
+        .phys_io        = 0x40000000,
-        MAPIO(corgi_map_io)
+        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
-        INITIRQ(corgi_init_irq)
+        .fixup          = fixup_corgi,
-        .init_machine = corgi_init,
+        .map_io         = corgi_map_io,
-        .timer = &pxa_timer,
+        .init_irq       = corgi_init_irq,
+        .init_machine   = corgi_init,
+        .timer          = &pxa_timer,
 MACHINE_END
 #endif
diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c
index c5a66bf4d3d5..386e107b53cc 100644
--- a/arch/arm/mach-pxa/idp.c
+++ b/arch/arm/mach-pxa/idp.c
@@ -181,10 +181,12 @@ static void __init idp_map_io(void)
 MACHINE_START(PXA_IDP, "Vibren PXA255 IDP")
-        MAINTAINER("Vibren Technologies")
+        /* Maintainer: Vibren Technologies */
-        BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
+        .phys_ram       = 0xa0000000,
-        MAPIO(idp_map_io)
+        .phys_io        = 0x40000000,
-        INITIRQ(idp_init_irq)
+        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
+        .map_io         = idp_map_io,
+        .init_irq       = idp_init_irq,
        .timer          = &pxa_timer,
-        INIT_MACHINE(idp_init)
+        .init_machine   = idp_init,
 MACHINE_END
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index f2c9e0d2b24b..6309853b59be 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -268,10 +268,12 @@ static void __init lubbock_map_io(void)
 }
 MACHINE_START(LUBBOCK, "Intel DBPXA250 Development Platform (aka Lubbock)")
-        MAINTAINER("MontaVista Software Inc.")
+        /* Maintainer: MontaVista Software Inc. */
-        BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
+        .phys_ram       = 0xa0000000,
-        MAPIO(lubbock_map_io)
+        .phys_io        = 0x40000000,
-        INITIRQ(lubbock_init_irq)
+        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
+        .map_io         = lubbock_map_io,
+        .init_irq       = lubbock_init_irq,
        .timer          = &pxa_timer,
-        INIT_MACHINE(lubbock_init)
+        .init_machine   = lubbock_init,
 MACHINE_END
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index 9896afca751f..827b7b5a5be8 100644
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -345,10 +345,12 @@ static void __init mainstone_map_io(void)
 }
 MACHINE_START(MAINSTONE, "Intel HCDDBBVA0 Development Platform (aka Mainstone)")
-        MAINTAINER("MontaVista Software Inc.")
+        /* Maintainer: MontaVista Software Inc. */
-        BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
+        .phys_ram       = 0xa0000000,
-        MAPIO(mainstone_map_io)
+        .phys_io        = 0x40000000,
-        INITIRQ(mainstone_init_irq)
+        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
+        .map_io         = mainstone_map_io,
+        .init_irq       = mainstone_init_irq,
        .timer          = &pxa_timer,
-        INIT_MACHINE(mainstone_init)
+        .init_machine   = mainstone_init,
 MACHINE_END
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index b6c746ea3830..0e4f6fab100a 100644
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -180,10 +180,12 @@ static void __init poodle_map_io(void)
 }
 MACHINE_START(POODLE, "SHARP Poodle")
-        BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
+        .phys_ram       = 0xa0000000,
-        FIXUP(fixup_poodle)
+        .phys_io        = 0x40000000,
-        MAPIO(poodle_map_io)
+        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
-        INITIRQ(pxa_init_irq)
+        .fixup          = fixup_poodle,
-        .timer = &pxa_timer,
+        .map_io         = poodle_map_io,
-        .init_machine = poodle_init,
+        .init_irq       = pxa_init_irq,
+        .timer          = &pxa_timer,
+        .init_machine   = poodle_init,
 MACHINE_END
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index 893964fb9659..9a791b07118d 100644
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -126,6 +126,7 @@ int pxa_cpu_pm_prepare(suspend_state_t state)
 {
        switch (state) {
        case PM_SUSPEND_MEM:
+        case PM_SUSPEND_STANDBY:
                return 0;
        default:
                return -EINVAL;
@@ -138,7 +139,10 @@ void pxa_cpu_pm_enter(suspend_state_t state)
        extern void pxa_cpu_suspend(unsigned int);
        extern void pxa_cpu_resume(void);
-        CKEN = CKEN22_MEMC | CKEN9_OSTIMER;
+        if (state == PM_SUSPEND_STANDBY)
+                CKEN = CKEN22_MEMC | CKEN9_OSTIMER | CKEN16_LCD |CKEN0_PWM0;
+        else
+                CKEN = CKEN22_MEMC | CKEN9_OSTIMER;
        /* ensure voltage-change sequencer not initiated, which hangs */
        PCFR &= ~PCFR_FVC;
@@ -147,6 +151,9 @@ void pxa_cpu_pm_enter(suspend_state_t state)
        PEDR = 0xDF12FE1B;
        switch (state) {
+        case PM_SUSPEND_STANDBY:
+                pxa_cpu_standby();
+                break;
        case PM_SUSPEND_MEM:
                /* set resume return address */
                PSPR = virt_to_phys(pxa_cpu_resume);
diff --git a/arch/arm/mach-pxa/standby.S b/arch/arm/mach-pxa/standby.S
new file mode 100644
index 000000000000..8a3f27b76784
--- /dev/null
+++ b/arch/arm/mach-pxa/standby.S
@@ -0,0 +1,32 @@
+/*
+ * PXA27x standby mode
+ *
+ * Author: David Burrage
+ *
+ * 2005 (c) MontaVista Software, Inc. This file is licensed under
+ * the terms of the GNU General Public License version 2. This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+#include <linux/config.h>
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+#include <asm/hardware.h>
+#include <asm/arch/pxa-regs.h>
+                .text
+ENTRY(pxa_cpu_standby)
+        ldr     r0, =PSSR
+        mov     r1, #(PSSR_PH | PSSR_STS)
+        mov     r2, #2
+        mov     r3, #UNCACHED_PHYS_0    @ Read mem context in.
+        ldr     ip, [r3]
+        b       1f
+        .align  5
+1:      mcr     p14, 0, r2, c7, c0, 0   @ put the system into Standby
+        str     r1, [r0]                @ make sure PSSR_PH/STS are clear
+        mov     pc, lr
diff --git a/arch/arm/mach-rpc/riscpc.c b/arch/arm/mach-rpc/riscpc.c
index 437106881436..a10268618f74 100644
--- a/arch/arm/mach-rpc/riscpc.c
+++ b/arch/arm/mach-rpc/riscpc.c
@@ -163,12 +163,14 @@ arch_initcall(rpc_init);
 extern struct sys_timer ioc_timer;
 MACHINE_START(RISCPC, "Acorn-RiscPC")
-        MAINTAINER("Russell King")
+        /* Maintainer: Russell King */
-        BOOT_MEM(0x10000000, 0x03000000, 0xe0000000)
+        .phys_ram       = 0x10000000,
-        BOOT_PARAMS(0x10000100)
+        .phys_io        = 0x03000000,
-        DISABLE_PARPORT(0)
+        .io_pg_offst    = ((0xe0000000) >> 18) & 0xfffc,
-        DISABLE_PARPORT(1)
+        .boot_params    = 0x10000100,
-        MAPIO(rpc_map_io)
+        .reserve_lp0    = 1,
-        INITIRQ(rpc_init_irq)
+        .reserve_lp1    = 1,
+        .map_io         = rpc_map_io,
+        .init_irq       = rpc_init_irq,
        .timer          = &ioc_timer,
 MACHINE_END
diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
index 534df0c6c770..d4d03d0daaec 100644
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
@@ -154,6 +154,11 @@ config S3C2410_PM_CHECK_CHUNKSIZE
          the CRC data block will take more memory, but wil identify any
          faults with better precision.
+config PM_SIMTEC
+        bool
+        depends on PM && (ARCH_BAST || MACH_VR1000)
+        default y
 config S3C2410_LOWLEVEL_UART_PORT
        int "S3C2410 UART to use for low-level messages"
        default 0
diff --git a/arch/arm/mach-s3c2410/Makefile b/arch/arm/mach-s3c2410/Makefile
index 7c379aad5d62..f99b689e4392 100644
--- a/arch/arm/mach-s3c2410/Makefile
+++ b/arch/arm/mach-s3c2410/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_S3C2410_DMA)  += dma.o
 # Power Management support
 obj-$(CONFIG_PM)           += pm.o sleep.o
+obj-$(CONFIG_PM_SIMTEC)    += pm-simtec.o
 # S3C2440 support
diff --git a/arch/arm/mach-s3c2410/devs.c b/arch/arm/mach-s3c2410/devs.c
index 64792f678668..4664bd11adc1 100644
--- a/arch/arm/mach-s3c2410/devs.c
+++ b/arch/arm/mach-s3c2410/devs.c
@@ -96,8 +96,8 @@ struct platform_device s3c_device_lcd = {
        .num_resources    = ARRAY_SIZE(s3c_lcd_resource),
        .resource         = s3c_lcd_resource,
        .dev              = {
-                .dma_mask = &s3c_device_lcd_dmamask,
+                .dma_mask               = &s3c_device_lcd_dmamask,
-                .coherent_dma_mask = 0xffffffffUL
+                .coherent_dma_mask      = 0xffffffffUL
        }
 };
diff --git a/arch/arm/mach-s3c2410/irq.c b/arch/arm/mach-s3c2410/irq.c
index b668c48f4399..cf9f46d88061 100644
--- a/arch/arm/mach-s3c2410/irq.c
+++ b/arch/arm/mach-s3c2410/irq.c
@@ -40,8 +40,11 @@
 *   04-Nov-2004  Ben Dooks
 *                Fix standard IRQ wake for EINT0..4 and RTC
 *
- *   22-Feb-2004  Ben Dooks
+ *   22-Feb-2005  Ben Dooks
 *                Fixed edge-triggering on ADC IRQ
+ *
+ *   28-Jun-2005  Ben Dooks
+ *                Mark IRQ_LCD valid
 */
 #include <linux/init.h>
@@ -366,7 +369,6 @@ static struct irqchip s3c_irq_eint0t4 = {
 #define INTMSK_UART1     (1UL << (IRQ_UART1 - IRQ_EINT0))
 #define INTMSK_UART2     (1UL << (IRQ_UART2 - IRQ_EINT0))
 #define INTMSK_ADCPARENT (1UL << (IRQ_ADCPARENT - IRQ_EINT0))
-#define INTMSK_LCD       (1UL << (IRQ_LCD - IRQ_EINT0))
 static inline void
 s3c_irqsub_mask(unsigned int irqno, unsigned int parentbit,
@@ -716,7 +718,6 @@ void __init s3c24xx_init_irq(void)
                case IRQ_UART0:
                case IRQ_UART1:
                case IRQ_UART2:
-                case IRQ_LCD:
                case IRQ_ADCPARENT:
                        set_irq_chip(irqno, &s3c_irq_level_chip);
                        set_irq_handler(irqno, do_level_IRQ);
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c
index f3e970039b65..ccb6bcefa46c 100644
--- a/arch/arm/mach-s3c2410/mach-bast.c
+++ b/arch/arm/mach-s3c2410/mach-bast.c
@@ -27,6 +27,7 @@
 *     10-Mar-2005 LCVR Changed S3C2410_VA to S3C24XX_VA
 *     14-Mar-2006 BJD  Updated for __iomem changes
 *     22-Jun-2006 BJD  Added DM9000 platform information
+ *     28-Jun-2006 BJD  Moved pm functionality out to common code
 */
 #include <linux/kernel.h>
@@ -67,7 +68,6 @@
 #include "devs.h"
 #include "cpu.h"
 #include "usb-simtec.h"
-#include "pm.h"
 #define COPYRIGHT ", (c) 2004-2005 Simtec Electronics"
@@ -405,44 +405,14 @@ void __init bast_map_io(void)
        usb_simtec_init();
 }
-void __init bast_init_irq(void)
-{
-        s3c24xx_init_irq();
-}
-#ifdef CONFIG_PM
-/* bast_init_machine
- *
- * enable the power management functions for the EB2410ITX
-*/
-static __init void bast_init_machine(void)
-{
-        unsigned long gstatus4;
-        printk(KERN_INFO "BAST Power Manangement" COPYRIGHT "\n");
-        gstatus4  = (__raw_readl(S3C2410_BANKCON7) & 0x3) << 30;
-        gstatus4 |= (__raw_readl(S3C2410_BANKCON6) & 0x3) << 28;
-        gstatus4 |= (__raw_readl(S3C2410_BANKSIZE) & S3C2410_BANKSIZE_MASK);
-        __raw_writel(gstatus4, S3C2410_GSTATUS4);
-        s3c2410_pm_init();
-}
-#else
-#define bast_init_machine NULL
-#endif
 MACHINE_START(BAST, "Simtec-BAST")
-     MAINTAINER("Ben Dooks <ben@simtec.co.uk>")
+        /* Maintainer: Ben Dooks <ben@simtec.co.uk> */
-     BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
+        .phys_ram       = S3C2410_SDRAM_PA,
-     BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
+        .phys_io        = S3C2410_PA_UART,
-     MAPIO(bast_map_io)
+        .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
-     INITIRQ(bast_init_irq)
+        .boot_params    = S3C2410_SDRAM_PA + 0x100,
-        .init_machine   = bast_init_machine,
+        .map_io         = bast_map_io,
+        .init_irq       = s3c24xx_init_irq,
        .timer          = &s3c24xx_timer,
 MACHINE_END
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c
index 2924afc068a4..ea4fb1a97a50 100644
--- a/arch/arm/mach-s3c2410/mach-h1940.c
+++ b/arch/arm/mach-s3c2410/mach-h1940.c
@@ -117,10 +117,12 @@ void __init h1940_init_irq(void)
 }
 MACHINE_START(H1940, "IPAQ-H1940")
-     MAINTAINER("Ben Dooks <ben@fluff.org>")
+        /* Maintainer: Ben Dooks <ben@fluff.org> */
-     BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
+        .phys_ram       = S3C2410_SDRAM_PA,
-     BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
+        .phys_io        = S3C2410_PA_UART,
-     MAPIO(h1940_map_io)
+        .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
-     INITIRQ(h1940_init_irq)
+        .boot_params    = S3C2410_SDRAM_PA + 0x100,
+        .map_io         = h1940_map_io,
+        .init_irq       = h1940_init_irq,
        .timer          = &s3c24xx_timer,
 MACHINE_END
diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c
index bd15998c129b..79044d9bce38 100644
--- a/arch/arm/mach-s3c2410/mach-n30.c
+++ b/arch/arm/mach-s3c2410/mach-n30.c
@@ -137,10 +137,11 @@ void __init n30_init(void)
 }
 MACHINE_START(N30, "Acer-N30")
-     MAINTAINER("Christer Weinigel <christer@weinigel.se>, Ben Dooks <ben-linux@fluff.org>")
+        /* Maintainer: Christer Weinigel <christer@weinigel.se>, Ben Dooks <ben-linux@fluff.org> */
-     BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
+        .phys_ram       = S3C2410_SDRAM_PA,
-     BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
+        .phys_io        = S3C2410_PA_UART,
+        .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
+        .boot_params    = S3C2410_SDRAM_PA + 0x100,
        .timer          = &s3c24xx_timer,
        .init_machine   = n30_init,
        .init_irq       = n30_init_irq,
diff --git a/arch/arm/mach-s3c2410/mach-nexcoder.c b/arch/arm/mach-s3c2410/mach-nexcoder.c
index 70487bf4b71e..d24c242414ca 100644
--- a/arch/arm/mach-s3c2410/mach-nexcoder.c
+++ b/arch/arm/mach-s3c2410/mach-nexcoder.c
@@ -147,9 +147,11 @@ void __init nexcoder_map_io(void)
 MACHINE_START(NEXCODER_2440, "NexVision - Nexcoder 2440")
-     MAINTAINER("Guillaume GOURAT <guillaume.gourat@nexvision.tv>")
+        /* Maintainer: Guillaume GOURAT <guillaume.gourat@nexvision.tv> */
-     BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
+        .phys_ram       = S3C2410_SDRAM_PA,
-     BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
+        .phys_io        = S3C2410_PA_UART,
+        .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
+        .boot_params    = S3C2410_SDRAM_PA + 0x100,
        .map_io         = nexcoder_map_io,
        .init_irq       = s3c24xx_init_irq,
        .timer          = &s3c24xx_timer,
diff --git a/arch/arm/mach-s3c2410/mach-otom.c b/arch/arm/mach-s3c2410/mach-otom.c
index 67d8ce8fb00f..d901ed492ff5 100644
--- a/arch/arm/mach-s3c2410/mach-otom.c
+++ b/arch/arm/mach-s3c2410/mach-otom.c
@@ -115,9 +115,11 @@ void __init otom11_map_io(void)
 MACHINE_START(OTOM, "Nex Vision - Otom 1.1")
-     MAINTAINER("Guillaume GOURAT <guillaume.gourat@nexvision.tv>")
+        /* Maintainer: Guillaume GOURAT <guillaume.gourat@nexvision.tv> */
-     BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
+        .phys_ram       = S3C2410_SDRAM_PA,
-     BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
+        .phys_io        = S3C2410_PA_UART,
+        .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
+        .boot_params    = S3C2410_SDRAM_PA + 0x100,
        .map_io         = otom11_map_io,
        .init_irq       = s3c24xx_init_irq,
        .timer          = &s3c24xx_timer,
diff --git a/arch/arm/mach-s3c2410/mach-rx3715.c b/arch/arm/mach-s3c2410/mach-rx3715.c
index f8d3a9784e71..a73d61c1de46 100644
--- a/arch/arm/mach-s3c2410/mach-rx3715.c
+++ b/arch/arm/mach-s3c2410/mach-rx3715.c
@@ -131,11 +131,13 @@ static void __init rx3715_init_machine(void)
 #endif
 MACHINE_START(RX3715, "IPAQ-RX3715")
-     MAINTAINER("Ben Dooks <ben@fluff.org>")
+        /* Maintainer: Ben Dooks <ben@fluff.org> */
-     BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
+        .phys_ram       = S3C2410_SDRAM_PA,
-     BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
+        .phys_io        = S3C2410_PA_UART,
-     MAPIO(rx3715_map_io)
+        .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
-     INITIRQ(rx3715_init_irq)
+        .boot_params    = S3C2410_SDRAM_PA + 0x100,
-     INIT_MACHINE(rx3715_init_machine)
+        .map_io         = rx3715_map_io,
+        .init_irq       = rx3715_init_irq,
+        .init_machine   = rx3715_init_machine,
        .timer          = &s3c24xx_timer,
 MACHINE_END
diff --git a/arch/arm/mach-s3c2410/mach-smdk2410.c b/arch/arm/mach-s3c2410/mach-smdk2410.c
index c1a4a1420ea0..67e903a700d3 100644
--- a/arch/arm/mach-s3c2410/mach-smdk2410.c
+++ b/arch/arm/mach-s3c2410/mach-smdk2410.c
@@ -112,11 +112,13 @@ void __init smdk2410_init_irq(void)
 MACHINE_START(SMDK2410, "SMDK2410") /* @TODO: request a new identifier and switch
                                    * to SMDK2410 */
-     MAINTAINER("Jonas Dietsche")
+        /* Maintainer: Jonas Dietsche */
-     BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
+        .phys_ram       = S3C2410_SDRAM_PA,
-     BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
+        .phys_io        = S3C2410_PA_UART,
-     MAPIO(smdk2410_map_io)
+        .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
-     INITIRQ(smdk2410_init_irq)
+        .boot_params    = S3C2410_SDRAM_PA + 0x100,
+        .map_io         = smdk2410_map_io,
+        .init_irq       = smdk2410_init_irq,
        .timer          = &s3c24xx_timer,
 MACHINE_END
diff --git a/arch/arm/mach-s3c2410/mach-smdk2440.c b/arch/arm/mach-s3c2410/mach-smdk2440.c
index 7857176d9bcb..357522106f68 100644
--- a/arch/arm/mach-s3c2410/mach-smdk2440.c
+++ b/arch/arm/mach-s3c2410/mach-smdk2440.c
@@ -124,9 +124,11 @@ void __init smdk2440_machine_init(void)
 }
 MACHINE_START(S3C2440, "SMDK2440")
-        MAINTAINER("Ben Dooks <ben@fluff.org>")
+        /* Maintainer: Ben Dooks <ben@fluff.org> */
-        BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
+        .phys_ram       = S3C2410_SDRAM_PA,
-        BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
+        .phys_io        = S3C2410_PA_UART,
+        .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
+        .boot_params    = S3C2410_SDRAM_PA + 0x100,
        .init_irq       = s3c24xx_init_irq,
        .map_io         = smdk2440_map_io,
diff --git a/arch/arm/mach-s3c2410/mach-vr1000.c b/arch/arm/mach-s3c2410/mach-vr1000.c
index 76be074944a0..924e8464c212 100644
--- a/arch/arm/mach-s3c2410/mach-vr1000.c
+++ b/arch/arm/mach-s3c2410/mach-vr1000.c
@@ -371,16 +371,14 @@ void __init vr1000_map_io(void)
        usb_simtec_init();
 }
-void __init vr1000_init_irq(void)
-{
-        s3c24xx_init_irq();
-}
 MACHINE_START(VR1000, "Thorcom-VR1000")
-     MAINTAINER("Ben Dooks <ben@simtec.co.uk>")
+        /* Maintainer: Ben Dooks <ben@simtec.co.uk> */
-     BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
+        .phys_ram       = S3C2410_SDRAM_PA,
-     BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
+        .phys_io        = S3C2410_PA_UART,
-     MAPIO(vr1000_map_io)
+        .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
-     INITIRQ(vr1000_init_irq)
+        .boot_params    = S3C2410_SDRAM_PA + 0x100,
+        .map_io         = vr1000_map_io,
+        .init_irq       = s3c24xx_init_irq,
        .timer          = &s3c24xx_timer,
 MACHINE_END
diff --git a/arch/arm/mach-s3c2410/pm-simtec.c b/arch/arm/mach-s3c2410/pm-simtec.c
new file mode 100644
index 000000000000..2cb798832223
--- /dev/null
+++ b/arch/arm/mach-s3c2410/pm-simtec.c
@@ -0,0 +1,65 @@
+/* linux/arch/arm/mach-s3c2410/pm-simtec.c
+ *
+ * Copyright (c) 2004 Simtec Electronics
+ *      Ben Dooks <ben@simtec.co.uk>
+ *
+ * http://armlinux.simtec.co.uk/
+ *
+ * Power Management helpers for Simtec S3C24XX implementations
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/interrupt.h>
+#include <linux/list.h>
+#include <linux/timer.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/hardware.h>
+#include <asm/io.h>
+#include <asm/arch/map.h>
+#include <asm/arch/regs-serial.h>
+#include <asm/arch/regs-gpio.h>
+#include <asm/arch/regs-mem.h>
+#include <asm/mach-types.h>
+#include "pm.h"
+#define COPYRIGHT ", (c) 2005 Simtec Electronics"
+/* pm_simtec_init
+ *
+ * enable the power management functions
+*/
+static __init int pm_simtec_init(void)
+{
+        unsigned long gstatus4;
+        /* check which machine we are running on */
+        if (!machine_is_bast() && !machine_is_vr1000())
+                return 0;
+        printk(KERN_INFO "Simtec Board Power Manangement" COPYRIGHT "\n");
+        gstatus4  = (__raw_readl(S3C2410_BANKCON7) & 0x3) << 30;
+        gstatus4 |= (__raw_readl(S3C2410_BANKCON6) & 0x3) << 28;
+        gstatus4 |= (__raw_readl(S3C2410_BANKSIZE) & S3C2410_BANKSIZE_MASK);
+        __raw_writel(gstatus4, S3C2410_GSTATUS4);
+        return s3c2410_pm_init();
+}
+arch_initcall(pm_simtec_init);
diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c
index bedf88fafe08..4d4d303ee3a8 100644
--- a/arch/arm/mach-sa1100/assabet.c
+++ b/arch/arm/mach-sa1100/assabet.c
@@ -431,11 +431,13 @@ static void __init assabet_map_io(void)
 MACHINE_START(ASSABET, "Intel-Assabet")
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        FIXUP(fixup_assabet)
+        .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
-        MAPIO(assabet_map_io)
+        .boot_params    = 0xc0000100,
-        INITIRQ(sa1100_init_irq)
+        .fixup          = fixup_assabet,
+        .map_io         = assabet_map_io,
+        .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
        .init_machine   = assabet_init,
 MACHINE_END
diff --git a/arch/arm/mach-sa1100/badge4.c b/arch/arm/mach-sa1100/badge4.c
index 6a60b497ab42..b6169cb09196 100644
--- a/arch/arm/mach-sa1100/badge4.c
+++ b/arch/arm/mach-sa1100/badge4.c
@@ -285,9 +285,11 @@ static void __init badge4_map_io(void)
 }
 MACHINE_START(BADGE4, "Hewlett-Packard Laboratories BadgePAD 4")
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        MAPIO(badge4_map_io)
+        .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
-        INITIRQ(sa1100_init_irq)
+        .boot_params    = 0xc0000100,
+        .map_io         = badge4_map_io,
+        .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
 MACHINE_END
diff --git a/arch/arm/mach-sa1100/cerf.c b/arch/arm/mach-sa1100/cerf.c
index f8edde5e7cbf..0aa918e24c31 100644
--- a/arch/arm/mach-sa1100/cerf.c
+++ b/arch/arm/mach-sa1100/cerf.c
@@ -123,10 +123,12 @@ static void __init cerf_init(void)
 }
 MACHINE_START(CERF, "Intrinsyc CerfBoard/CerfCube")
-        MAINTAINER("support@intrinsyc.com")
+        /* Maintainer: support@intrinsyc.com */
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+        .phys_ram       = 0xc0000000,
-        MAPIO(cerf_map_io)
+        .phys_io        = 0x80000000,
-        INITIRQ(cerf_init_irq)
+        .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
+        .map_io         = cerf_map_io,
+        .init_irq       = cerf_init_irq,
        .timer          = &sa1100_timer,
        .init_machine   = cerf_init,
 MACHINE_END
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
index 99287890d396..8cb69113a57c 100644
--- a/arch/arm/mach-sa1100/collie.c
+++ b/arch/arm/mach-sa1100/collie.c
@@ -184,9 +184,11 @@ static void __init collie_map_io(void)
 }
 MACHINE_START(COLLIE, "Sharp-Collie")
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+        .phys_ram       = 0xc0000000,
-        MAPIO(collie_map_io)
+        .phys_io        = 0x80000000,
-        INITIRQ(sa1100_init_irq)
+        .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
+        .map_io         = collie_map_io,
+        .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
        .init_machine   = collie_init,
 MACHINE_END
diff --git a/arch/arm/mach-sa1100/cpu-sa1110.c b/arch/arm/mach-sa1100/cpu-sa1110.c
index 8d2a89a2ea01..04c94ab6c18b 100644
--- a/arch/arm/mach-sa1100/cpu-sa1110.c
+++ b/arch/arm/mach-sa1100/cpu-sa1110.c
@@ -271,8 +271,7 @@ static int sa1110_target(struct cpufreq_policy *policy,
         */
        sdram_set_refresh(2);
        if (!irqs_disabled()) {
-                set_current_state(TASK_UNINTERRUPTIBLE);
+                msleep(20);
-                schedule_timeout(20 * HZ / 1000);
        } else {
                mdelay(20);
        }
diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c
index 65dbe991426d..e7aa2681ca64 100644
--- a/arch/arm/mach-sa1100/h3600.c
+++ b/arch/arm/mach-sa1100/h3600.c
@@ -380,10 +380,12 @@ static void __init h3100_map_io(void)
 }
 MACHINE_START(H3100, "Compaq iPAQ H3100")
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        MAPIO(h3100_map_io)
+        .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
-        INITIRQ(sa1100_init_irq)
+        .boot_params    = 0xc0000100,
+        .map_io         = h3100_map_io,
+        .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
        .init_machine   = h3xxx_mach_init,
 MACHINE_END
@@ -496,10 +498,12 @@ static void __init h3600_map_io(void)
 }
 MACHINE_START(H3600, "Compaq iPAQ H3600")
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        MAPIO(h3600_map_io)
+        .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
-        INITIRQ(sa1100_init_irq)
+        .boot_params    = 0xc0000100,
+        .map_io         = h3600_map_io,
+        .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
        .init_machine   = h3xxx_mach_init,
 MACHINE_END
@@ -881,10 +885,12 @@ static void __init h3800_map_io(void)
 }
 MACHINE_START(H3800, "Compaq iPAQ H3800")
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        MAPIO(h3800_map_io)
+        .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
-        INITIRQ(h3800_init_irq)
+        .boot_params    = 0xc0000100,
+        .map_io         = h3800_map_io,
+        .init_irq       = h3800_init_irq,
        .timer          = &sa1100_timer,
        .init_machine   = h3xxx_mach_init,
 MACHINE_END
diff --git a/arch/arm/mach-sa1100/hackkit.c b/arch/arm/mach-sa1100/hackkit.c
index 570841779714..502d65cfe654 100644
--- a/arch/arm/mach-sa1100/hackkit.c
+++ b/arch/arm/mach-sa1100/hackkit.c
@@ -191,10 +191,12 @@ static void __init hackkit_init(void)
 */
 MACHINE_START(HACKKIT, "HackKit Cpu Board")
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        MAPIO(hackkit_map_io)
+        .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
-        INITIRQ(sa1100_init_irq)
+        .boot_params    = 0xc0000100,
+        .map_io         = hackkit_map_io,
+        .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
        .init_machine   = hackkit_init,
 MACHINE_END
diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c
index 6be78291a878..eee3cbc5ec4f 100644
--- a/arch/arm/mach-sa1100/jornada720.c
+++ b/arch/arm/mach-sa1100/jornada720.c
@@ -97,9 +97,11 @@ static void __init jornada720_map_io(void)
 }
 MACHINE_START(JORNADA720, "HP Jornada 720")
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        MAPIO(jornada720_map_io)
+        .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
-        INITIRQ(sa1100_init_irq)
+        .boot_params    = 0xc0000100,
+        .map_io         = jornada720_map_io,
+        .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
 MACHINE_END
diff --git a/arch/arm/mach-sa1100/lart.c b/arch/arm/mach-sa1100/lart.c
index 51c08ccfb8db..870b488aeda4 100644
--- a/arch/arm/mach-sa1100/lart.c
+++ b/arch/arm/mach-sa1100/lart.c
@@ -41,9 +41,11 @@ static void __init lart_map_io(void)
 }
 MACHINE_START(LART, "LART")
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        MAPIO(lart_map_io)
+        .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
-        INITIRQ(sa1100_init_irq)
+        .boot_params    = 0xc0000100,
+        .map_io         = lart_map_io,
+        .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
 MACHINE_END
diff --git a/arch/arm/mach-sa1100/pleb.c b/arch/arm/mach-sa1100/pleb.c
index 5606bd71b024..e17b58fb9c9c 100644
--- a/arch/arm/mach-sa1100/pleb.c
+++ b/arch/arm/mach-sa1100/pleb.c
@@ -146,9 +146,11 @@ static void __init pleb_map_io(void)
 }
 MACHINE_START(PLEB, "PLEB")
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+        .phys_ram       = 0xc0000000,
-        MAPIO(pleb_map_io)
+        .phys_io        = 0x80000000,
-        INITIRQ(sa1100_init_irq)
+        .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
+        .map_io         = pleb_map_io,
+        .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
        .init_machine   = pleb_init,
 MACHINE_END
diff --git a/arch/arm/mach-sa1100/shannon.c b/arch/arm/mach-sa1100/shannon.c
index edddd559be02..43a00359fcdd 100644
--- a/arch/arm/mach-sa1100/shannon.c
+++ b/arch/arm/mach-sa1100/shannon.c
@@ -76,10 +76,12 @@ static void __init shannon_map_io(void)
 }
 MACHINE_START(SHANNON, "Shannon (AKA: Tuxscreen)")
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        MAPIO(shannon_map_io)
+        .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
-        INITIRQ(sa1100_init_irq)
+        .boot_params    = 0xc0000100,
+        .map_io         = shannon_map_io,
+        .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
        .init_machine   = shannon_init,
 MACHINE_END
diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c
index 8d113d629867..77978586b126 100644
--- a/arch/arm/mach-sa1100/simpad.c
+++ b/arch/arm/mach-sa1100/simpad.c
@@ -215,10 +215,12 @@ arch_initcall(simpad_init);
 MACHINE_START(SIMPAD, "Simpad")
-        MAINTAINER("Holger Freyther")
+        /* Maintainer: Holger Freyther */
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        MAPIO(simpad_map_io)
+        .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
-        INITIRQ(sa1100_init_irq)
+        .boot_params    = 0xc0000100,
+        .map_io         = simpad_map_io,
+        .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
 MACHINE_END
diff --git a/arch/arm/mach-shark/core.c b/arch/arm/mach-shark/core.c
index aa0e2f6e02f6..726445895b5c 100644
--- a/arch/arm/mach-shark/core.c
+++ b/arch/arm/mach-shark/core.c
@@ -105,10 +105,12 @@ static struct sys_timer shark_timer = {
 };
 MACHINE_START(SHARK, "Shark")
-        MAINTAINER("Alexander Schulz")
+        /* Maintainer: Alexander Schulz */
-        BOOT_MEM(0x08000000, 0x40000000, 0xe0000000)
+        .phys_ram       = 0x08000000,
-        BOOT_PARAMS(0x08003000)
+        .phys_io        = 0x40000000,
-        MAPIO(shark_map_io)
+        .io_pg_offst    = ((0xe0000000) >> 18) & 0xfffc,
-        INITIRQ(shark_init_irq)
+        .boot_params    = 0x08003000,
+        .map_io         = shark_map_io,
+        .init_irq       = shark_init_irq,
        .timer          = &shark_timer,
 MACHINE_END
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index 9d1f2253e987..f01c0f8a2bb3 100644
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -33,6 +33,7 @@
 #include <asm/mach-types.h>
 #include <asm/hardware/amba.h>
 #include <asm/hardware/amba_clcd.h>
+#include <asm/hardware/arm_timer.h>
 #include <asm/hardware/icst307.h>
 #include <asm/mach/arch.h>
@@ -788,38 +789,25 @@ void __init versatile_init(void)
 */
 #define TIMER_INTERVAL  (TICKS_PER_uSEC * mSEC_10)
 #if TIMER_INTERVAL >= 0x100000
-#define TIMER_RELOAD    (TIMER_INTERVAL >> 8)           /* Divide by 256 */
+#define TIMER_RELOAD    (TIMER_INTERVAL >> 8)
-#define TIMER_CTRL      0x88                            /* Enable, Clock / 256 */
+#define TIMER_DIVISOR   (TIMER_CTRL_DIV256)
 #define TICKS2USECS(x)  (256 * (x) / TICKS_PER_uSEC)
 #elif TIMER_INTERVAL >= 0x10000
 #define TIMER_RELOAD    (TIMER_INTERVAL >> 4)           /* Divide by 16 */
-#define TIMER_CTRL      0x84                            /* Enable, Clock / 16 */
+#define TIMER_DIVISOR   (TIMER_CTRL_DIV16)
 #define TICKS2USECS(x)  (16 * (x) / TICKS_PER_uSEC)
 #else
 #define TIMER_RELOAD    (TIMER_INTERVAL)
-#define TIMER_CTRL      0x80                            /* Enable */
+#define TIMER_DIVISOR   (TIMER_CTRL_DIV1)
 #define TICKS2USECS(x)  ((x) / TICKS_PER_uSEC)
 #endif
-#define TIMER_CTRL_IE   (1 << 5)        /* Interrupt Enable */
-/*
- * What does it look like?
- */
-typedef struct TimerStruct {
-        unsigned long TimerLoad;
-        unsigned long TimerValue;
-        unsigned long TimerControl;
-        unsigned long TimerClear;
-} TimerStruct_t;
 /*
 * Returns number of ms since last clock interrupt.  Note that interrupts
 * will have been disabled by do_gettimeoffset()
 */
 static unsigned long versatile_gettimeoffset(void)
 {
-        volatile TimerStruct_t *timer0 = (TimerStruct_t *)TIMER0_VA_BASE;
        unsigned long ticks1, ticks2, status;
        /*
@@ -828,11 +816,11 @@ static unsigned long versatile_gettimeoffset(void)
         * an interrupt.  We get around this by ensuring that the
         * counter has not reloaded between our two reads.
         */
-        ticks2 = timer0->TimerValue & 0xffff;
+        ticks2 = readl(TIMER0_VA_BASE + TIMER_VALUE) & 0xffff;
        do {
                ticks1 = ticks2;
                status = __raw_readl(VA_IC_BASE + VIC_IRQ_RAW_STATUS);
-                ticks2 = timer0->TimerValue & 0xffff;
+                ticks2 = readl(TIMER0_VA_BASE + TIMER_VALUE) & 0xffff;
        } while (ticks2 > ticks1);
        /*
@@ -859,12 +847,10 @@ static unsigned long versatile_gettimeoffset(void)
 */
 static irqreturn_t versatile_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
-        volatile TimerStruct_t *timer0 = (volatile TimerStruct_t *)TIMER0_VA_BASE;
        write_seqlock(&xtime_lock);
        // ...clear the interrupt
-        timer0->TimerClear = 1;
+        writel(1, TIMER0_VA_BASE + TIMER_INTCLR);
        timer_tick(regs);
@@ -884,31 +870,32 @@ static struct irqaction versatile_timer_irq = {
 */
 static void __init versatile_timer_init(void)
 {
-        volatile TimerStruct_t *timer0 = (volatile TimerStruct_t *)TIMER0_VA_BASE;
+        u32 val;
-        volatile TimerStruct_t *timer1 = (volatile TimerStruct_t *)TIMER1_VA_BASE;
-        volatile TimerStruct_t *timer2 = (volatile TimerStruct_t *)TIMER2_VA_BASE;
-        volatile TimerStruct_t *timer3 = (volatile TimerStruct_t *)TIMER3_VA_BASE;
        /* 
         * set clock frequency: 
         *      VERSATILE_REFCLK is 32KHz
         *      VERSATILE_TIMCLK is 1MHz
         */
-        *(volatile unsigned int *)IO_ADDRESS(VERSATILE_SCTL_BASE) |= 
+        val = readl(IO_ADDRESS(VERSATILE_SCTL_BASE));
-          ((VERSATILE_TIMCLK << VERSATILE_TIMER1_EnSel) | (VERSATILE_TIMCLK << VERSATILE_TIMER2_EnSel) | 
+        writel((VERSATILE_TIMCLK << VERSATILE_TIMER1_EnSel) |
-           (VERSATILE_TIMCLK << VERSATILE_TIMER3_EnSel) | (VERSATILE_TIMCLK << VERSATILE_TIMER4_EnSel));
+               (VERSATILE_TIMCLK << VERSATILE_TIMER2_EnSel) | 
+               (VERSATILE_TIMCLK << VERSATILE_TIMER3_EnSel) |
+               (VERSATILE_TIMCLK << VERSATILE_TIMER4_EnSel) | val,
+               IO_ADDRESS(VERSATILE_SCTL_BASE));
        /*
         * Initialise to a known state (all timers off)
         */
-        timer0->TimerControl = 0;
+        writel(0, TIMER0_VA_BASE + TIMER_CTRL);
-        timer1->TimerControl = 0;
+        writel(0, TIMER1_VA_BASE + TIMER_CTRL);
-        timer2->TimerControl = 0;
+        writel(0, TIMER2_VA_BASE + TIMER_CTRL);
-        timer3->TimerControl = 0;
+        writel(0, TIMER3_VA_BASE + TIMER_CTRL);
-        timer0->TimerLoad    = TIMER_RELOAD;
+        writel(TIMER_RELOAD, TIMER0_VA_BASE + TIMER_LOAD);
-        timer0->TimerValue   = TIMER_RELOAD;
+        writel(TIMER_RELOAD, TIMER0_VA_BASE + TIMER_VALUE);
-        timer0->TimerControl = TIMER_CTRL | 0x40 | TIMER_CTRL_IE;  /* periodic + IE */
+        writel(TIMER_DIVISOR | TIMER_CTRL_ENABLE | TIMER_CTRL_PERIODIC |
+               TIMER_CTRL_IE, TIMER0_VA_BASE + TIMER_CTRL);
        /* 
         * Make irqs happen for the system timer
diff --git a/arch/arm/mach-versatile/versatile_ab.c b/arch/arm/mach-versatile/versatile_ab.c
index d332084586cf..8b0b3bef24ae 100644
--- a/arch/arm/mach-versatile/versatile_ab.c
+++ b/arch/arm/mach-versatile/versatile_ab.c
@@ -35,11 +35,13 @@
 #include "core.h"
 MACHINE_START(VERSATILE_AB, "ARM-Versatile AB")
-        MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
+        /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
-        BOOT_MEM(0x00000000, 0x101f1000, 0xf11f1000)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = 0x101f1000,
-        MAPIO(versatile_map_io)
+        .io_pg_offst    = ((0xf11f1000) >> 18) & 0xfffc,
-        INITIRQ(versatile_init_irq)
+        .boot_params    = 0x00000100,
+        .map_io         = versatile_map_io,
+        .init_irq       = versatile_init_irq,
        .timer          = &versatile_timer,
-        INIT_MACHINE(versatile_init)
+        .init_machine   = versatile_init,
 MACHINE_END
diff --git a/arch/arm/mach-versatile/versatile_pb.c b/arch/arm/mach-versatile/versatile_pb.c
index 2702099a68f3..7c3078c38916 100644
--- a/arch/arm/mach-versatile/versatile_pb.c
+++ b/arch/arm/mach-versatile/versatile_pb.c
@@ -99,11 +99,13 @@ static int __init versatile_pb_init(void)
 arch_initcall(versatile_pb_init);
 MACHINE_START(VERSATILE_PB, "ARM-Versatile PB")
-        MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
+        /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
-        BOOT_MEM(0x00000000, 0x101f1000, 0xf11f1000)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = 0x101f1000,
-        MAPIO(versatile_map_io)
+        .io_pg_offst    = ((0xf11f1000) >> 18) & 0xfffc,
-        INITIRQ(versatile_init_irq)
+        .boot_params    = 0x00000100,
+        .map_io         = versatile_map_io,
+        .init_irq       = versatile_init_irq,
        .timer          = &versatile_timer,
-        INIT_MACHINE(versatile_init)
+        .init_machine   = versatile_init,
 MACHINE_END
diff --git a/arch/arm/mm/blockops.c b/arch/arm/mm/blockops.c
index 806c6eeb1b0c..4f5ee2d08996 100644
--- a/arch/arm/mm/blockops.c
+++ b/arch/arm/mm/blockops.c
@@ -25,13 +25,14 @@ blk_flush_kern_dcache_page(void *kaddr)
 {
        asm(
        "add    r1, r0, %0                                                      \n\
+        sub     r1, r1, %1                                                      \n\
 1:      .word   0xec401f0e      @ mcrr  p15, 0, r0, r1, c14, 0  @ blocking      \n\
        mov     r0, #0                                                          \n\
        mcr     p15, 0, r0, c7, c5, 0                                           \n\
        mcr     p15, 0, r0, c7, c10, 4                                          \n\
        mov     pc, lr"
        :
-        : "I" (PAGE_SIZE));
+        : "I" (PAGE_SIZE), "I" (L1_CACHE_BYTES));
 }
 /*
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index e25b4fd8412c..65bfe84b6d67 100644
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -372,49 +372,50 @@ do_bad(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
 static struct fsr_info {
        int     (*fn)(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
        int     sig;
+        int     code;
        const char *name;
 } fsr_info[] = {
        /*
         * The following are the standard ARMv3 and ARMv4 aborts.  ARMv5
         * defines these to be "precise" aborts.
         */
-        { do_bad,               SIGSEGV, "vector exception"                },
+        { do_bad,               SIGSEGV, 0,             "vector exception"                 },
-        { do_bad,               SIGILL,  "alignment exception"             },
+        { do_bad,               SIGILL,  BUS_ADRALN,    "alignment exception"              },
-        { do_bad,               SIGKILL, "terminal exception"              },
+        { do_bad,               SIGKILL, 0,             "terminal exception"               },
-        { do_bad,               SIGILL,  "alignment exception"             },
+        { do_bad,               SIGILL,  BUS_ADRALN,    "alignment exception"              },
-        { do_bad,               SIGBUS,  "external abort on linefetch"     },
+        { do_bad,               SIGBUS,  0,             "external abort on linefetch"      },
-        { do_translation_fault, SIGSEGV, "section translation fault"       },
+        { do_translation_fault, SIGSEGV, SEGV_MAPERR,   "section translation fault"        },
-        { do_bad,               SIGBUS,  "external abort on linefetch"     },
+        { do_bad,               SIGBUS,  0,             "external abort on linefetch"      },
-        { do_page_fault,        SIGSEGV, "page translation fault"          },
+        { do_page_fault,        SIGSEGV, SEGV_MAPERR,   "page translation fault"           },
-        { do_bad,               SIGBUS,  "external abort on non-linefetch" },
+        { do_bad,               SIGBUS,  0,             "external abort on non-linefetch"  },
-        { do_bad,               SIGSEGV, "section domain fault"            },
+        { do_bad,               SIGSEGV, SEGV_ACCERR,   "section domain fault"             },
-        { do_bad,               SIGBUS,  "external abort on non-linefetch" },
+        { do_bad,               SIGBUS,  0,             "external abort on non-linefetch"  },
-        { do_bad,               SIGSEGV, "page domain fault"               },
+        { do_bad,               SIGSEGV, SEGV_ACCERR,   "page domain fault"                },
-        { do_bad,               SIGBUS,  "external abort on translation"   },
+        { do_bad,               SIGBUS,  0,             "external abort on translation"    },
-        { do_sect_fault,        SIGSEGV, "section permission fault"        },
+        { do_sect_fault,        SIGSEGV, SEGV_ACCERR,   "section permission fault"         },
-        { do_bad,               SIGBUS,  "external abort on translation"   },
+        { do_bad,               SIGBUS,  0,             "external abort on translation"    },
-        { do_page_fault,        SIGSEGV, "page permission fault"           },
+        { do_page_fault,        SIGSEGV, SEGV_ACCERR,   "page permission fault"            },
        /*
         * The following are "imprecise" aborts, which are signalled by bit
         * 10 of the FSR, and may not be recoverable.  These are only
         * supported if the CPU abort handler supports bit 10.
         */
-        { do_bad,               SIGBUS,  "unknown 16"                      },
+        { do_bad,               SIGBUS,  0,             "unknown 16"                       },
-        { do_bad,               SIGBUS,  "unknown 17"                      },
+        { do_bad,               SIGBUS,  0,             "unknown 17"                       },
-        { do_bad,               SIGBUS,  "unknown 18"                      },
+        { do_bad,               SIGBUS,  0,             "unknown 18"                       },
-        { do_bad,               SIGBUS,  "unknown 19"                      },
+        { do_bad,               SIGBUS,  0,             "unknown 19"                       },
-        { do_bad,               SIGBUS,  "lock abort"                      }, /* xscale */
+        { do_bad,               SIGBUS,  0,             "lock abort"                       }, /* xscale */
-        { do_bad,               SIGBUS,  "unknown 21"                      },
+        { do_bad,               SIGBUS,  0,             "unknown 21"                       },
-        { do_bad,               SIGBUS,  "imprecise external abort"        }, /* xscale */
+        { do_bad,               SIGBUS,  BUS_OBJERR,    "imprecise external abort"         }, /* xscale */
-        { do_bad,               SIGBUS,  "unknown 23"                      },
+        { do_bad,               SIGBUS,  0,             "unknown 23"                       },
-        { do_bad,               SIGBUS,  "dcache parity error"             }, /* xscale */
+        { do_bad,               SIGBUS,  0,             "dcache parity error"              }, /* xscale */
-        { do_bad,               SIGBUS,  "unknown 25"                      },
+        { do_bad,               SIGBUS,  0,             "unknown 25"                       },
-        { do_bad,               SIGBUS,  "unknown 26"                      },
+        { do_bad,               SIGBUS,  0,             "unknown 26"                       },
-        { do_bad,               SIGBUS,  "unknown 27"                      },
+        { do_bad,               SIGBUS,  0,             "unknown 27"                       },
-        { do_bad,               SIGBUS,  "unknown 28"                      },
+        { do_bad,               SIGBUS,  0,             "unknown 28"                       },
-        { do_bad,               SIGBUS,  "unknown 29"                      },
+        { do_bad,               SIGBUS,  0,             "unknown 29"                       },
-        { do_bad,               SIGBUS,  "unknown 30"                      },
+        { do_bad,               SIGBUS,  0,             "unknown 30"                       },
-        { do_bad,               SIGBUS,  "unknown 31"                      }
+        { do_bad,               SIGBUS,  0,             "unknown 31"                       }
 };
 void __init
@@ -435,15 +436,19 @@ asmlinkage void
 do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
 {
        const struct fsr_info *inf = fsr_info + (fsr & 15) + ((fsr & (1 << 10)) >> 6);
+        struct siginfo info;
        if (!inf->fn(addr, fsr, regs))
                return;
        printk(KERN_ALERT "Unhandled fault: %s (0x%03x) at 0x%08lx\n",
                inf->name, fsr, addr);
-        force_sig(inf->sig, current);
-        show_pte(current->mm, addr);
+        info.si_signo = inf->sig;
-        die_if_kernel("Oops", regs, 0);
+        info.si_errno = 0;
+        info.si_code  = inf->code;
+        info.si_addr  = (void __user *)addr;
+        notify_die("", regs, &info, fsr, 0);
 }
 asmlinkage void
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 6dcb23d64bf5..edffa47a4b2a 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -437,7 +437,7 @@ void __init paging_init(struct meminfo *mi, struct machine_desc *mdesc)
        memtable_init(mi);
        if (mdesc->map_io)
                mdesc->map_io();
-        flush_tlb_all();
+        local_flush_tlb_all();
        /*
         * initialise the zones within each node
diff --git a/arch/arm/mm/mm-armv.c b/arch/arm/mm/mm-armv.c
index 052ab443ec4e..c3bd503b43a2 100644
--- a/arch/arm/mm/mm-armv.c
+++ b/arch/arm/mm/mm-armv.c
@@ -682,7 +682,7 @@ void __init memtable_init(struct meminfo *mi)
        }
        flush_cache_all();
-        flush_tlb_all();
+        local_flush_tlb_all();
        top_pmd = pmd_off_k(0xffff0000);
 }
diff --git a/arch/arm/mm/proc-arm1020.S b/arch/arm/mm/proc-arm1020.S
index 1f325231b9e4..5c0ae5260d1c 100644
--- a/arch/arm/mm/proc-arm1020.S
+++ b/arch/arm/mm/proc-arm1020.S
@@ -445,14 +445,14 @@ __arm1020_setup:
        /*
         *  R
         * .RVI ZFRS BLDP WCAM
-         * .0.1 1001 ..11 0101  /* FIXME: why no V bit? */
+         * .011 1001 ..11 0101
         */
        .type   arm1020_cr1_clear, #object
        .type   arm1020_cr1_set, #object
 arm1020_cr1_clear:
        .word   0x593f
 arm1020_cr1_set:
-        .word   0x1935
+        .word   0x3935
        __INITDATA
diff --git a/arch/arm/mm/proc-arm1020e.S b/arch/arm/mm/proc-arm1020e.S
index 142a2c2d6f0b..d69389c4d4ba 100644
--- a/arch/arm/mm/proc-arm1020e.S
+++ b/arch/arm/mm/proc-arm1020e.S
@@ -427,14 +427,14 @@ __arm1020e_setup:
        /*
         *  R
         * .RVI ZFRS BLDP WCAM
-         * .0.1 1001 ..11 0101  /* FIXME: why no V bit? */
+         * .011 1001 ..11 0101
         */
        .type   arm1020e_cr1_clear, #object
        .type   arm1020e_cr1_set, #object
 arm1020e_cr1_clear:
        .word   0x5f3f
 arm1020e_cr1_set:
-        .word   0x1935
+        .word   0x3935
        __INITDATA
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
index e3d8510f4340..352db98ee269 100644
--- a/arch/arm/mm/proc-v6.S
+++ b/arch/arm/mm/proc-v6.S
@@ -200,7 +200,7 @@ __v6_setup:
        mcr     p15, 0, r4, c2, c0, 1           @ load TTB1
 #ifdef CONFIG_VFP
        mrc     p15, 0, r0, c1, c0, 2
-        orr     r0, r0, #(3 << 20)
+        orr     r0, r0, #(0xf << 20)
        mcr     p15, 0, r0, c1, c0, 2           @ Enable full access to VFP
 #endif
        mrc     p15, 0, r0, c1, c0, 0           @ read control register
diff --git a/arch/arm/oprofile/Makefile b/arch/arm/oprofile/Makefile
index ba1a6e9f2b28..8ffb523e6c77 100644
--- a/arch/arm/oprofile/Makefile
+++ b/arch/arm/oprofile/Makefile
@@ -6,6 +6,6 @@ DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
                oprofilefs.o oprofile_stats.o \
                timer_int.o )
-oprofile-y                              := $(DRIVER_OBJS) init.o
+oprofile-y                              := $(DRIVER_OBJS) init.o backtrace.o
 oprofile-$(CONFIG_CPU_XSCALE)           += common.o op_model_xscale.o
diff --git a/arch/arm/oprofile/backtrace.c b/arch/arm/oprofile/backtrace.c
new file mode 100644
index 000000000000..ec58d3e2eb8b
--- /dev/null
+++ b/arch/arm/oprofile/backtrace.c
@@ -0,0 +1,144 @@
+/*
+ * Arm specific backtracing code for oprofile
+ *
+ * Copyright 2005 Openedhand Ltd.
+ *
+ * Author: Richard Purdie <rpurdie@openedhand.com>
+ *
+ * Based on i386 oprofile backtrace code by John Levon, David Smith
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+#include <linux/oprofile.h>
+#include <linux/sched.h>
+#include <linux/mm.h>
+#include <asm/ptrace.h>
+#include <asm/uaccess.h>
+/*
+ * The registers we're interested in are at the end of the variable
+ * length saved register structure. The fp points at the end of this
+ * structure so the address of this struct is:
+ * (struct frame_tail *)(xxx->fp)-1
+ */
+struct frame_tail {
+        struct frame_tail *fp;
+        unsigned long sp;
+        unsigned long lr;
+} __attribute__((packed));
+#ifdef CONFIG_FRAME_POINTER
+static struct frame_tail* kernel_backtrace(struct frame_tail *tail)
+{
+        oprofile_add_trace(tail->lr);
+        /* frame pointers should strictly progress back up the stack
+         * (towards higher addresses) */
+        if (tail >= tail->fp)
+                return NULL;
+        return tail->fp-1;
+}
+#endif
+static struct frame_tail* user_backtrace(struct frame_tail *tail)
+{
+        struct frame_tail buftail;
+        /* hardware pte might not be valid due to dirty/accessed bit emulation
+         * so we use copy_from_user and benefit from exception fixups */
+        if (copy_from_user(&buftail, tail, sizeof(struct frame_tail)))
+                return NULL;
+        oprofile_add_trace(buftail.lr);
+        /* frame pointers should strictly progress back up the stack
+         * (towards higher addresses) */
+        if (tail >= buftail.fp)
+                return NULL;
+        return buftail.fp-1;
+}
+/* Compare two addresses and see if they're on the same page */
+#define CMP_ADDR_EQUAL(x,y,offset) ((((unsigned long) x) >> PAGE_SHIFT) \
+        == ((((unsigned long) y) + offset) >> PAGE_SHIFT))
+/* check that the page(s) containing the frame tail are present */
+static int pages_present(struct frame_tail *tail)
+{
+        struct mm_struct * mm = current->mm;
+        if (!check_user_page_readable(mm, (unsigned long)tail))
+                return 0;
+        if (CMP_ADDR_EQUAL(tail, tail, 8))
+                return 1;
+        if (!check_user_page_readable(mm, ((unsigned long)tail) + 8))
+                return 0;
+        return 1;
+}
+/*
+ * |             | /\ Higher addresses
+ * |             |
+ * --------------- stack base (address of current_thread_info)
+ * | thread info |
+ * .             .
+ * |    stack    |
+ * --------------- saved regs->ARM_fp value if valid (frame_tail address)
+ * .             .
+ * --------------- struct pt_regs stored on stack (struct pt_regs *)
+ * |             |
+ * .             .
+ * |             |
+ * --------------- %esp
+ * |             |
+ * |             | \/ Lower addresses
+ *
+ * Thus, &pt_regs <-> stack base restricts the valid(ish) fp values
+ */
+static int valid_kernel_stack(struct frame_tail *tail, struct pt_regs *regs)
+{
+        unsigned long tailaddr = (unsigned long)tail;
+        unsigned long stack = (unsigned long)regs;
+        unsigned long stack_base = (stack & ~(THREAD_SIZE - 1)) + THREAD_SIZE;
+        return (tailaddr > stack) && (tailaddr < stack_base);
+}
+void arm_backtrace(struct pt_regs const *regs, unsigned int depth)
+{
+        struct frame_tail *tail;
+        unsigned long last_address = 0;
+        tail = ((struct frame_tail *) regs->ARM_fp) - 1;
+        if (!user_mode(regs)) {
+#ifdef CONFIG_FRAME_POINTER
+                while (depth-- && tail && valid_kernel_stack(tail, regs)) {
+                        tail = kernel_backtrace(tail);
+                }
+#endif
+                return;
+        }
+        while (depth-- && tail && !((unsigned long) tail & 3)) {
+                if ((!CMP_ADDR_EQUAL(last_address, tail, 0)
+                        || !CMP_ADDR_EQUAL(last_address, tail, 8))
+                                && !pages_present(tail))
+                        return;
+                last_address = (unsigned long) tail;
+                tail = user_backtrace(tail);
+        }
+}
diff --git a/arch/arm/oprofile/init.c b/arch/arm/oprofile/init.c
index cce3d3015eb7..d315a3a86c86 100644
--- a/arch/arm/oprofile/init.c
+++ b/arch/arm/oprofile/init.c
@@ -20,6 +20,8 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
        ret = pmu_init(ops, &op_xscale_spec);
 #endif
+        ops->backtrace = arm_backtrace;
        return ret;
 }
diff --git a/arch/arm/oprofile/op_arm_model.h b/arch/arm/oprofile/op_arm_model.h
index 2d4caf4781ad..2148d07484b7 100644
--- a/arch/arm/oprofile/op_arm_model.h
+++ b/arch/arm/oprofile/op_arm_model.h
@@ -24,6 +24,8 @@ struct op_arm_model_spec {
 extern struct op_arm_model_spec op_xscale_spec;
 #endif
+extern void arm_backtrace(struct pt_regs * const regs, unsigned int depth);
 extern int __init pmu_init(struct oprofile_operations *ops, struct op_arm_model_spec *spec);
 extern void pmu_exit(void);
 #endif /* OP_ARM_MODEL_H */
diff --git a/arch/arm/vfp/vfp.h b/arch/arm/vfp/vfp.h
index 55a02bc994a3..4b97950984e9 100644
--- a/arch/arm/vfp/vfp.h
+++ b/arch/arm/vfp/vfp.h
@@ -117,7 +117,13 @@ static inline u64 vfp_estimate_div128to64(u64 nh, u64 nl, u64 m)
        if (nh >= m)
                return ~0ULL;
        mh = m >> 32;
-        z = (mh << 32 <= nh) ? 0xffffffff00000000ULL : (nh / mh) << 32;
+        if (mh << 32 <= nh) {
+                z = 0xffffffff00000000ULL;
+        } else {
+                z = nh;
+                do_div(z, mh);
+                z <<= 32;
+        }
        mul64to128(&termh, &terml, m, z);
        sub128(&remh, &reml, nh, nl, termh, terml);
        ml = m << 32;
@@ -126,7 +132,12 @@ static inline u64 vfp_estimate_div128to64(u64 nh, u64 nl, u64 m)
                add128(&remh, &reml, remh, reml, mh, ml);
        }
        remh = (remh << 32) | (reml >> 32);
-        z |= (mh << 32 <= remh) ? 0xffffffff : remh / mh;
+        if (mh << 32 <= remh) {
+                z |= 0xffffffff;
+        } else {
+                do_div(remh, mh);
+                z |= remh;
+        }
        return z;
 }
diff --git a/arch/arm/vfp/vfpdouble.c b/arch/arm/vfp/vfpdouble.c
index fa3053e84db5..b801cd66b6ea 100644
--- a/arch/arm/vfp/vfpdouble.c
+++ b/arch/arm/vfp/vfpdouble.c
@@ -32,6 +32,8 @@
 */
 #include <linux/kernel.h>
 #include <linux/bitops.h>
+#include <asm/div64.h>
 #include <asm/ptrace.h>
 #include <asm/vfp.h>
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c
index 3aeedd2afc70..22f3da4e0829 100644
--- a/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
@@ -89,7 +89,7 @@ void vfp_raise_sigfpe(unsigned int sicode, struct pt_regs *regs)
        current->thread.error_code = 0;
        current->thread.trap_no = 6;
-        force_sig_info(SIGFPE, &info, current);
+        send_sig_info(SIGFPE, &info, current);
 }
 static void vfp_panic(char *reason)
diff --git a/arch/arm/vfp/vfpsingle.c b/arch/arm/vfp/vfpsingle.c
index 6849fe35cb2e..14dd696ddeb1 100644
--- a/arch/arm/vfp/vfpsingle.c
+++ b/arch/arm/vfp/vfpsingle.c
@@ -32,6 +32,8 @@
 */
 #include <linux/kernel.h>
 #include <linux/bitops.h>
+#include <asm/div64.h>
 #include <asm/ptrace.h>
 #include <asm/vfp.h>
@@ -303,7 +305,11 @@ u32 vfp_estimate_sqrt_significand(u32 exponent, u32 significand)
                if (z <= a)
                        return (s32)a >> 1;
        }
-        return (u32)(((u64)a << 31) / z) + (z >> 1);
+        {
+                u64 v = (u64)a << 31;
+                do_div(v, z);
+                return v + (z >> 1);
+        }
 }
 static u32 vfp_single_fsqrt(int sd, int unused, s32 m, u32 fpscr)
@@ -1107,7 +1113,11 @@ static u32 vfp_single_fdiv(int sd, int sn, s32 m, u32 fpscr)
                vsn.significand >>= 1;
                vsd.exponent++;
        }
-        vsd.significand = ((u64)vsn.significand << 32) / vsm.significand;
+        {
+                u64 significand = (u64)vsn.significand << 32;
+                do_div(significand, vsm.significand);
+                vsd.significand = significand;
+        }
        if ((vsd.significand & 0x3f) == 0)
                vsd.significand |= ((u64)vsm.significand * vsd.significand != (u64)vsn.significand << 32);