Merge ARM fixes

24 files changed, 83 insertions, 733 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2c32c8702cfd..4409561ea32c 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -9,6 +9,7 @@ config ARM
         bool
         default y
         select RTC_LIB
+        select SYS_SUPPORTS_APM_EMULATION
         help
           The ARM series is a line of low-power-consumption RISC chip designs
           licensed by ARM Ltd and targeted at embedded applications and
@@ -17,6 +18,9 @@ config ARM
           Europe.  There is an ARM Linux project with a web page at
           <http://www.arm.linux.org.uk/>.
 
+config SYS_SUPPORTS_APM_EMULATION
+        bool
+
 config GENERIC_TIME
         bool
         default n
@@ -25,6 +29,10 @@ config MMU
         bool
         default y
 
+config NO_IOPORT
+        bool
+        default n
+
 config EISA
         bool
         ---help---
@@ -96,6 +104,10 @@ config GENERIC_BUST_SPINLOCK
 config ARCH_MAY_HAVE_PC_FDC
         bool
 
+config ZONE_DMA
+        bool
+        default y
+
 config GENERIC_ISA_DMA
         bool
 
@@ -301,6 +313,7 @@ config ARCH_RPC
         select TIMER_ACORN
         select ARCH_MAY_HAVE_PC_FDC
         select ISA_DMA_API
+        select NO_IOPORT
         help
           On the Acorn Risc-PC, Linux can support the internal IDE disk and
           CD-ROM interface, serial and parallel port, and the floppy drive.
@@ -414,7 +427,7 @@ source arch/arm/mm/Kconfig
 
 config IWMMXT
         bool "Enable iWMMXt support"
-        depends CPU_XSCALE || CPU_XSC3
+        depends on CPU_XSCALE || CPU_XSC3
         default y if PXA27x
         help
           Enable support for iWMMXt context switching at run time if
@@ -892,31 +905,6 @@ menu "Power management options"
 
 source "kernel/power/Kconfig"
 
-config APM
-        tristate "Advanced Power Management Emulation"
-        ---help---
-          APM is a BIOS specification for saving power using several different
-          techniques. This is mostly useful for battery powered laptops with
-          APM compliant BIOSes. If you say Y here, the system time will be
-          reset after a RESUME operation, the /proc/apm device will provide
-          battery status information, and user-space programs will receive
-          notification of APM "events" (e.g. battery status change).
-
-          In order to use APM, you will need supporting software. For location
-          and more information, read <file:Documentation/pm.txt> and the
-          Battery Powered Linux mini-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-
-          This driver does not spin down disk drives (see the hdparm(8)
-          manpage ("man 8 hdparm") for that), and it doesn't turn off
-          VESA-compliant "green" monitors.
-
-          Generally, if you don't have a battery in your machine, there isn't
-          much point in using this driver and you should say N. If you get
-          random kernel OOPSes or reboots that don't seem to be related to
-          anything, try disabling/enabling this option (or disabling/enabling
-          APM in your BIOS).
-
 endmenu
 
 source "net/Kconfig"
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 1320418b5d6f..ab9f2d4bd04e 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -124,7 +124,7 @@ endif
  machine-$(CONFIG_ARCH_H720X)      := h720x
  machine-$(CONFIG_ARCH_AAEC2000)   := aaec2000
  machine-$(CONFIG_ARCH_REALVIEW)   := realview
- machine-$(CONFIG_ARCH_AT91)       := at91rm9200
+ machine-$(CONFIG_ARCH_AT91)       := at91
  machine-$(CONFIG_ARCH_EP93XX)     := ep93xx
  machine-$(CONFIG_ARCH_PNX4008)    := pnx4008
  machine-$(CONFIG_ARCH_NETX)       := netx
diff --git a/arch/arm/common/rtctime.c b/arch/arm/common/rtctime.c
index 4e5445cfb0ea..bf1075e1f571 100644
--- a/arch/arm/common/rtctime.c
+++ b/arch/arm/common/rtctime.c
@@ -329,7 +329,7 @@ static int rtc_fasync(int fd, struct file *file, int on)
         return fasync_helper(fd, file, on, &rtc_async_queue);
 }
 
-static struct file_operations rtc_fops = {
+static const struct file_operations rtc_fops = {
         .owner          = THIS_MODULE,
         .llseek         = no_llseek,
         .read           = rtc_read,
diff --git a/arch/arm/common/sharpsl_pm.c b/arch/arm/common/sharpsl_pm.c
index b3599743093b..a9bc5b52218f 100644
--- a/arch/arm/common/sharpsl_pm.c
+++ b/arch/arm/common/sharpsl_pm.c
@@ -23,11 +23,11 @@
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/leds.h>
+#include <linux/apm-emulation.h>
 
 #include <asm/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
-#include <asm/apm.h>
 #include <asm/arch/pm.h>
 #include <asm/arch/pxa-regs.h>
 #include <asm/arch/sharpsl.h>
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index d5002889773e..bb28087bf818 100644
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -10,7 +10,6 @@ obj-y		:= compat.o entry-armv.o entry-common.o irq.o \
                    process.o ptrace.o semaphore.o setup.o signal.o sys_arm.o \
                    time.o traps.o
 
-obj-$(CONFIG_APM)               += apm.o
 obj-$(CONFIG_ISA_DMA_API)       += dma.o
 obj-$(CONFIG_ARCH_ACORN)        += ecard.o 
 obj-$(CONFIG_FIQ)               += fiq.o
diff --git a/arch/arm/kernel/apm.c b/arch/arm/kernel/apm.c
deleted file mode 100644
index 2c37b70b17ab..000000000000
--- a/arch/arm/kernel/apm.c
+++ /dev/null
@@ -1,672 +0,0 @@
-/*
- * bios-less APM driver for ARM Linux 
- *  Jamey Hicks <jamey@crl.dec.com>
- *  adapted from the APM BIOS driver for Linux by Stephen Rothwell (sfr@linuxcare.com)
- *
- * APM 1.2 Reference:
- *   Intel Corporation, Microsoft Corporation. Advanced Power Management
- *   (APM) BIOS Interface Specification, Revision 1.2, February 1996.
- *
- * [This document is available from Microsoft at:
- *    http://www.microsoft.com/hwdev/busbios/amp_12.htm]
- */
-#include <linux/module.h>
-#include <linux/poll.h>
-#include <linux/slab.h>
-#include <linux/proc_fs.h>
-#include <linux/miscdevice.h>
-#include <linux/apm_bios.h>
-#include <linux/capability.h>
-#include <linux/sched.h>
-#include <linux/pm.h>
-#include <linux/device.h>
-#include <linux/kernel.h>
-#include <linux/list.h>
-#include <linux/init.h>
-#include <linux/completion.h>
-#include <linux/kthread.h>
-#include <linux/delay.h>
-
-#include <asm/apm.h> /* apm_power_info */
-#include <asm/system.h>
-
-/*
- * The apm_bios device is one of the misc char devices.
- * This is its minor number.
- */
-#define APM_MINOR_DEV   134
-
-/*
- * See Documentation/Config.help for the configuration options.
- *
- * Various options can be changed at boot time as follows:
- * (We allow underscores for compatibility with the modules code)
- *      apm=on/off                      enable/disable APM
- */
-
-/*
- * Maximum number of events stored
- */
-#define APM_MAX_EVENTS          16
-
-struct apm_queue {
-        unsigned int            event_head;
-        unsigned int            event_tail;
-        apm_event_t             events[APM_MAX_EVENTS];
-};
-
-/*
- * The per-file APM data
- */
-struct apm_user {
-        struct list_head        list;
-
-        unsigned int            suser: 1;
-        unsigned int            writer: 1;
-        unsigned int            reader: 1;
-
-        int                     suspend_result;
-        unsigned int            suspend_state;
-#define SUSPEND_NONE    0               /* no suspend pending */
-#define SUSPEND_PENDING 1               /* suspend pending read */
-#define SUSPEND_READ    2               /* suspend read, pending ack */
-#define SUSPEND_ACKED   3               /* suspend acked */
-#define SUSPEND_WAIT    4               /* waiting for suspend */
-#define SUSPEND_DONE    5               /* suspend completed */
-
-        struct apm_queue        queue;
-};
-
-/*
- * Local variables
- */
-static int suspends_pending;
-static int apm_disabled;
-static struct task_struct *kapmd_tsk;
-
-static DECLARE_WAIT_QUEUE_HEAD(apm_waitqueue);
-static DECLARE_WAIT_QUEUE_HEAD(apm_suspend_waitqueue);
-
-/*
- * This is a list of everyone who has opened /dev/apm_bios
- */
-static DECLARE_RWSEM(user_list_lock);
-static LIST_HEAD(apm_user_list);
-
-/*
- * kapmd info.  kapmd provides us a process context to handle
- * "APM" events within - specifically necessary if we're going
- * to be suspending the system.
- */
-static DECLARE_WAIT_QUEUE_HEAD(kapmd_wait);
-static DEFINE_SPINLOCK(kapmd_queue_lock);
-static struct apm_queue kapmd_queue;
-
-static DEFINE_MUTEX(state_lock);
-
-static const char driver_version[] = "1.13";    /* no spaces */
-
-
-
-/*
- * Compatibility cruft until the IPAQ people move over to the new
- * interface.
- */
-static void __apm_get_power_status(struct apm_power_info *info)
-{
-}
-
-/*
- * This allows machines to provide their own "apm get power status" function.
- */
-void (*apm_get_power_status)(struct apm_power_info *) = __apm_get_power_status;
-EXPORT_SYMBOL(apm_get_power_status);
-
-
-/*
- * APM event queue management.
- */
-static inline int queue_empty(struct apm_queue *q)
-{
-        return q->event_head == q->event_tail;
-}
-
-static inline apm_event_t queue_get_event(struct apm_queue *q)
-{
-        q->event_tail = (q->event_tail + 1) % APM_MAX_EVENTS;
-        return q->events[q->event_tail];
-}
-
-static void queue_add_event(struct apm_queue *q, apm_event_t event)
-{
-        q->event_head = (q->event_head + 1) % APM_MAX_EVENTS;
-        if (q->event_head == q->event_tail) {
-                static int notified;
-
-                if (notified++ == 0)
-                    printk(KERN_ERR "apm: an event queue overflowed\n");
-                q->event_tail = (q->event_tail + 1) % APM_MAX_EVENTS;
-        }
-        q->events[q->event_head] = event;
-}
-
-static void queue_event(apm_event_t event)
-{
-        struct apm_user *as;
-
-        down_read(&user_list_lock);
-        list_for_each_entry(as, &apm_user_list, list) {
-                if (as->reader)
-                        queue_add_event(&as->queue, event);
-        }
-        up_read(&user_list_lock);
-        wake_up_interruptible(&apm_waitqueue);
-}
-
-/*
- * queue_suspend_event - queue an APM suspend event.
- *
- * Check that we're in a state where we can suspend.  If not,
- * return -EBUSY.  Otherwise, queue an event to all "writer"
- * users.  If there are no "writer" users, return '1' to
- * indicate that we can immediately suspend.
- */
-static int queue_suspend_event(apm_event_t event, struct apm_user *sender)
-{
-        struct apm_user *as;
-        int ret = 1;
-
-        mutex_lock(&state_lock);
-        down_read(&user_list_lock);
-
-        /*
-         * If a thread is still processing, we can't suspend, so reject
-         * the request.
-         */
-        list_for_each_entry(as, &apm_user_list, list) {
-                if (as != sender && as->reader && as->writer && as->suser &&
-                    as->suspend_state != SUSPEND_NONE) {
-                        ret = -EBUSY;
-                        goto out;
-                }
-        }
-
-        list_for_each_entry(as, &apm_user_list, list) {
-                if (as != sender && as->reader && as->writer && as->suser) {
-                        as->suspend_state = SUSPEND_PENDING;
-                        suspends_pending++;
-                        queue_add_event(&as->queue, event);
-                        ret = 0;
-                }
-        }
- out:
-        up_read(&user_list_lock);
-        mutex_unlock(&state_lock);
-        wake_up_interruptible(&apm_waitqueue);
-        return ret;
-}
-
-static void apm_suspend(void)
-{
-        struct apm_user *as;
-        int err = pm_suspend(PM_SUSPEND_MEM);
-
-        /*
-         * Anyone on the APM queues will think we're still suspended.
-         * Send a message so everyone knows we're now awake again.
-         */
-        queue_event(APM_NORMAL_RESUME);
-
-        /*
-         * Finally, wake up anyone who is sleeping on the suspend.
-         */
-        mutex_lock(&state_lock);
-        down_read(&user_list_lock);
-        list_for_each_entry(as, &apm_user_list, list) {
-                if (as->suspend_state == SUSPEND_WAIT ||
-                    as->suspend_state == SUSPEND_ACKED) {
-                        as->suspend_result = err;
-                        as->suspend_state = SUSPEND_DONE;
-                }
-        }
-        up_read(&user_list_lock);
-        mutex_unlock(&state_lock);
-
-        wake_up(&apm_suspend_waitqueue);
-}
-
-static ssize_t apm_read(struct file *fp, char __user *buf, size_t count, loff_t *ppos)
-{
-        struct apm_user *as = fp->private_data;
-        apm_event_t event;
-        int i = count, ret = 0;
-
-        if (count < sizeof(apm_event_t))
-                return -EINVAL;
-
-        if (queue_empty(&as->queue) && fp->f_flags & O_NONBLOCK)
-                return -EAGAIN;
-
-        wait_event_interruptible(apm_waitqueue, !queue_empty(&as->queue));
-
-        while ((i >= sizeof(event)) && !queue_empty(&as->queue)) {
-                event = queue_get_event(&as->queue);
-
-                ret = -EFAULT;
-                if (copy_to_user(buf, &event, sizeof(event)))
-                        break;
-
-                mutex_lock(&state_lock);
-                if (as->suspend_state == SUSPEND_PENDING &&
-                    (event == APM_SYS_SUSPEND || event == APM_USER_SUSPEND))
-                        as->suspend_state = SUSPEND_READ;
-                mutex_unlock(&state_lock);
-
-                buf += sizeof(event);
-                i -= sizeof(event);
-        }
-
-        if (i < count)
-                ret = count - i;
-
-        return ret;
-}
-
-static unsigned int apm_poll(struct file *fp, poll_table * wait)
-{
-        struct apm_user *as = fp->private_data;
-
-        poll_wait(fp, &apm_waitqueue, wait);
-        return queue_empty(&as->queue) ? 0 : POLLIN | POLLRDNORM;
-}
-
-/*
- * apm_ioctl - handle APM ioctl
- *
- * APM_IOC_SUSPEND
- *   This IOCTL is overloaded, and performs two functions.  It is used to:
- *     - initiate a suspend
- *     - acknowledge a suspend read from /dev/apm_bios.
- *   Only when everyone who has opened /dev/apm_bios with write permission
- *   has acknowledge does the actual suspend happen.
- */
-static int
-apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg)
-{
-        struct apm_user *as = filp->private_data;
-        unsigned long flags;
-        int err = -EINVAL;
-
-        if (!as->suser || !as->writer)
-                return -EPERM;
-
-        switch (cmd) {
-        case APM_IOC_SUSPEND:
-                mutex_lock(&state_lock);
-
-                as->suspend_result = -EINTR;
-
-                if (as->suspend_state == SUSPEND_READ) {
-                        int pending;
-
-                        /*
-                         * If we read a suspend command from /dev/apm_bios,
-                         * then the corresponding APM_IOC_SUSPEND ioctl is
-                         * interpreted as an acknowledge.
-                         */
-                        as->suspend_state = SUSPEND_ACKED;
-                        suspends_pending--;
-                        pending = suspends_pending == 0;
-                        mutex_unlock(&state_lock);
-
-                        /*
-                         * If there are no further acknowledges required,
-                         * suspend the system.
-                         */
-                        if (pending)
-                                apm_suspend();
-
-                        /*
-                         * Wait for the suspend/resume to complete.  If there
-                         * are pending acknowledges, we wait here for them.
-                         *
-                         * Note: we need to ensure that the PM subsystem does
-                         * not kick us out of the wait when it suspends the
-                         * threads.
-                         */
-                        flags = current->flags;
-                        current->flags |= PF_NOFREEZE;
-
-                        wait_event(apm_suspend_waitqueue,
-                                   as->suspend_state == SUSPEND_DONE);
-                } else {
-                        as->suspend_state = SUSPEND_WAIT;
-                        mutex_unlock(&state_lock);
-
-                        /*
-                         * Otherwise it is a request to suspend the system.
-                         * Queue an event for all readers, and expect an
-                         * acknowledge from all writers who haven't already
-                         * acknowledged.
-                         */
-                        err = queue_suspend_event(APM_USER_SUSPEND, as);
-                        if (err < 0) {
-                                /*
-                                 * Avoid taking the lock here - this
-                                 * should be fine.
-                                 */
-                                as->suspend_state = SUSPEND_NONE;
-                                break;
-                        }
-
-                        if (err > 0)
-                                apm_suspend();
-
-                        /*
-                         * Wait for the suspend/resume to complete.  If there
-                         * are pending acknowledges, we wait here for them.
-                         *
-                         * Note: we need to ensure that the PM subsystem does
-                         * not kick us out of the wait when it suspends the
-                         * threads.
-                         */
-                        flags = current->flags;
-                        current->flags |= PF_NOFREEZE;
-
-                        wait_event_interruptible(apm_suspend_waitqueue,
-                                         as->suspend_state == SUSPEND_DONE);
-                }
-
-                current->flags = flags;
-
-                mutex_lock(&state_lock);
-                err = as->suspend_result;
-                as->suspend_state = SUSPEND_NONE;
-                mutex_unlock(&state_lock);
-                break;
-        }
-
-        return err;
-}
-
-static int apm_release(struct inode * inode, struct file * filp)
-{
-        struct apm_user *as = filp->private_data;
-        int pending = 0;
-
-        filp->private_data = NULL;
-
-        down_write(&user_list_lock);
-        list_del(&as->list);
-        up_write(&user_list_lock);
-
-        /*
-         * We are now unhooked from the chain.  As far as new
-         * events are concerned, we no longer exist.  However, we
-         * need to balance suspends_pending, which means the
-         * possibility of sleeping.
-         */
-        mutex_lock(&state_lock);
-        if (as->suspend_state != SUSPEND_NONE) {
-                suspends_pending -= 1;
-                pending = suspends_pending == 0;
-        }
-        mutex_unlock(&state_lock);
-        if (pending)
-                apm_suspend();
-
-        kfree(as);
-        return 0;
-}
-
-static int apm_open(struct inode * inode, struct file * filp)
-{
-        struct apm_user *as;
-
-        as = kzalloc(sizeof(*as), GFP_KERNEL);
-        if (as) {
-                /*
-                 * XXX - this is a tiny bit broken, when we consider BSD
-                 * process accounting. If the device is opened by root, we
-                 * instantly flag that we used superuser privs. Who knows,
-                 * we might close the device immediately without doing a
-                 * privileged operation -- cevans
-                 */
-                as->suser = capable(CAP_SYS_ADMIN);
-                as->writer = (filp->f_mode & FMODE_WRITE) == FMODE_WRITE;
-                as->reader = (filp->f_mode & FMODE_READ) == FMODE_READ;
-
-                down_write(&user_list_lock);
-                list_add(&as->list, &apm_user_list);
-                up_write(&user_list_lock);
-
-                filp->private_data = as;
-        }
-
-        return as ? 0 : -ENOMEM;
-}
-
-static struct file_operations apm_bios_fops = {
-        .owner          = THIS_MODULE,
-        .read           = apm_read,
-        .poll           = apm_poll,
-        .ioctl          = apm_ioctl,
-        .open           = apm_open,
-        .release        = apm_release,
-};
-
-static struct miscdevice apm_device = {
-        .minor          = APM_MINOR_DEV,
-        .name           = "apm_bios",
-        .fops           = &apm_bios_fops
-};
-
-
-#ifdef CONFIG_PROC_FS
-/*
- * Arguments, with symbols from linux/apm_bios.h.
- *
- *   0) Linux driver version (this will change if format changes)
- *   1) APM BIOS Version.  Usually 1.0, 1.1 or 1.2.
- *   2) APM flags from APM Installation Check (0x00):
- *      bit 0: APM_16_BIT_SUPPORT
- *      bit 1: APM_32_BIT_SUPPORT
- *      bit 2: APM_IDLE_SLOWS_CLOCK
- *      bit 3: APM_BIOS_DISABLED
- *      bit 4: APM_BIOS_DISENGAGED
- *   3) AC line status
- *      0x00: Off-line
- *      0x01: On-line
- *      0x02: On backup power (BIOS >= 1.1 only)
- *      0xff: Unknown
- *   4) Battery status
- *      0x00: High
- *      0x01: Low
- *      0x02: Critical
- *      0x03: Charging
- *      0x04: Selected battery not present (BIOS >= 1.2 only)
- *      0xff: Unknown
- *   5) Battery flag
- *      bit 0: High
- *      bit 1: Low
- *      bit 2: Critical
- *      bit 3: Charging
- *      bit 7: No system battery
- *      0xff: Unknown
- *   6) Remaining battery life (percentage of charge):
- *      0-100: valid
- *      -1: Unknown
- *   7) Remaining battery life (time units):
- *      Number of remaining minutes or seconds
- *      -1: Unknown
- *   8) min = minutes; sec = seconds
- */
-static int apm_get_info(char *buf, char **start, off_t fpos, int length)
-{
-        struct apm_power_info info;
-        char *units;
-        int ret;
-
-        info.ac_line_status = 0xff;
-        info.battery_status = 0xff;
-        info.battery_flag   = 0xff;
-        info.battery_life   = -1;
-        info.time           = -1;
-        info.units          = -1;
-
-        if (apm_get_power_status)
-                apm_get_power_status(&info);
-
-        switch (info.units) {
-        default:        units = "?";    break;
-        case 0:         units = "min";  break;
-        case 1:         units = "sec";  break;
-        }
-
-        ret = sprintf(buf, "%s 1.2 0x%02x 0x%02x 0x%02x 0x%02x %d%% %d %s\n",
-                     driver_version, APM_32_BIT_SUPPORT,
-                     info.ac_line_status, info.battery_status,
-                     info.battery_flag, info.battery_life,
-                     info.time, units);
-
-        return ret;
-}
-#endif
-
-static int kapmd(void *arg)
-{
-        do {
-                apm_event_t event;
-                int ret;
-
-                wait_event_interruptible(kapmd_wait,
-                                !queue_empty(&kapmd_queue) || kthread_should_stop());
-
-                if (kthread_should_stop())
-                        break;
-
-                spin_lock_irq(&kapmd_queue_lock);
-                event = 0;
-                if (!queue_empty(&kapmd_queue))
-                        event = queue_get_event(&kapmd_queue);
-                spin_unlock_irq(&kapmd_queue_lock);
-
-                switch (event) {
-                case 0:
-                        break;
-
-                case APM_LOW_BATTERY:
-                case APM_POWER_STATUS_CHANGE:
-                        queue_event(event);
-                        break;
-
-                case APM_USER_SUSPEND:
-                case APM_SYS_SUSPEND:
-                        ret = queue_suspend_event(event, NULL);
-                        if (ret < 0) {
-                                /*
-                                 * We were busy.  Try again in 50ms.
-                                 */
-                                queue_add_event(&kapmd_queue, event);
-                                msleep(50);
-                        }
-                        if (ret > 0)
-                                apm_suspend();
-                        break;
-
-                case APM_CRITICAL_SUSPEND:
-                        apm_suspend();
-                        break;
-                }
-        } while (1);
-
-        return 0;
-}
-
-static int __init apm_init(void)
-{
-        int ret;
-
-        if (apm_disabled) {
-                printk(KERN_NOTICE "apm: disabled on user request.\n");
-                return -ENODEV;
-        }
-
-        kapmd_tsk = kthread_create(kapmd, NULL, "kapmd");
-        if (IS_ERR(kapmd_tsk)) {
-                ret = PTR_ERR(kapmd_tsk);
-                kapmd_tsk = NULL;
-                return ret;
-        }
-        kapmd_tsk->flags |= PF_NOFREEZE;
-        wake_up_process(kapmd_tsk);
-
-#ifdef CONFIG_PROC_FS
-        create_proc_info_entry("apm", 0, NULL, apm_get_info);
-#endif
-
-        ret = misc_register(&apm_device);
-        if (ret != 0) {
-                remove_proc_entry("apm", NULL);
-                kthread_stop(kapmd_tsk);
-        }
-
-        return ret;
-}
-
-static void __exit apm_exit(void)
-{
-        misc_deregister(&apm_device);
-        remove_proc_entry("apm", NULL);
-
-        kthread_stop(kapmd_tsk);
-}
-
-module_init(apm_init);
-module_exit(apm_exit);
-
-MODULE_AUTHOR("Stephen Rothwell");
-MODULE_DESCRIPTION("Advanced Power Management");
-MODULE_LICENSE("GPL");
-
-#ifndef MODULE
-static int __init apm_setup(char *str)
-{
-        while ((str != NULL) && (*str != '\0')) {
-                if (strncmp(str, "off", 3) == 0)
-                        apm_disabled = 1;
-                if (strncmp(str, "on", 2) == 0)
-                        apm_disabled = 0;
-                str = strchr(str, ',');
-                if (str != NULL)
-                        str += strspn(str, ", \t");
-        }
-        return 1;
-}
-
-__setup("apm=", apm_setup);
-#endif
-
-/**
- * apm_queue_event - queue an APM event for kapmd
- * @event: APM event
- *
- * Queue an APM event for kapmd to process and ultimately take the
- * appropriate action.  Only a subset of events are handled:
- *   %APM_LOW_BATTERY
- *   %APM_POWER_STATUS_CHANGE
- *   %APM_USER_SUSPEND
- *   %APM_SYS_SUSPEND
- *   %APM_CRITICAL_SUSPEND
- */
-void apm_queue_event(apm_event_t event)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&kapmd_queue_lock, flags);
-        queue_add_event(&kapmd_queue, event);
-        spin_unlock_irqrestore(&kapmd_queue_lock, flags);
-
-        wake_up_interruptible(&kapmd_wait);
-}
-EXPORT_SYMBOL(apm_queue_event);
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c
index ec01f08f5642..e101846ab7dd 100644
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
@@ -159,8 +159,7 @@ void __init init_IRQ(void)
         int irq;
 
         for (irq = 0; irq < NR_IRQS; irq++)
-                irq_desc[irq].status |= IRQ_NOREQUEST | IRQ_DELAYED_DISABLE |
-                        IRQ_NOPROBE;
+                irq_desc[irq].status |= IRQ_NOREQUEST | IRQ_NOPROBE;
 
 #ifdef CONFIG_SMP
         bad_irq_desc.affinity = CPU_MASK_ALL;
diff --git a/arch/arm/kernel/isa.c b/arch/arm/kernel/isa.c
index 54bbd9fe255c..50a30bc91872 100644
--- a/arch/arm/kernel/isa.c
+++ b/arch/arm/kernel/isa.c
@@ -70,5 +70,5 @@ register_isa_ports(unsigned int membase, unsigned int portbase, unsigned int por
         isa_membase = membase;
         isa_portbase = portbase;
         isa_portshift = portshift;
-        isa_sysctl_header = register_sysctl_table(ctl_bus, 0);
+        isa_sysctl_header = register_sysctl_table(ctl_bus);
 }
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 243aea458057..03e37af315d7 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -109,7 +109,7 @@ unsigned long phys_initrd_size __initdata = 0;
 static struct meminfo meminfo __initdata = { 0, };
 static const char *cpu_name;
 static const char *machine_name;
-static char command_line[COMMAND_LINE_SIZE];
+static char __initdata command_line[COMMAND_LINE_SIZE];
 
 static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE;
 static union { char c[4]; unsigned long l; } endian_test __initdata = { { 'l', '?', '?', 'b' } };
@@ -806,8 +806,8 @@ void __init setup_arch(char **cmdline_p)
         init_mm.end_data   = (unsigned long) &_edata;
         init_mm.brk        = (unsigned long) &_end;
 
-        memcpy(saved_command_line, from, COMMAND_LINE_SIZE);
-        saved_command_line[COMMAND_LINE_SIZE-1] = '\0';
+        memcpy(boot_command_line, from, COMMAND_LINE_SIZE);
+        boot_command_line[COMMAND_LINE_SIZE-1] = '\0';
         parse_cmdline(cmdline_p, from);
         paging_init(&meminfo, mdesc);
         request_standard_resources(&meminfo, mdesc);
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index 3825acd6687d..f61decb89ba2 100644
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
@@ -80,16 +80,6 @@ static unsigned long dummy_gettimeoffset(void)
 #endif
 
 /*
- * Scheduler clock - returns current time in nanosec units.
- * This is the default implementation.  Sub-architecture
- * implementations can override this.
- */
-unsigned long long __attribute__((weak)) sched_clock(void)
-{
-        return (unsigned long long)jiffies * (1000000000 / HZ);
-}
-
-/*
  * An implementation of printk_clock() independent from
  * sched_clock().  This avoids non-bootable kernels when
  * printk_clock is enabled.
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
index a8fa75ea07a9..b929a60f7547 100644
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@ -53,10 +53,12 @@ SECTIONS
                 __security_initcall_start = .;
                         *(.security_initcall.init)
                 __security_initcall_end = .;
+#ifdef CONFIG_BLK_DEV_INITRD
                 . = ALIGN(32);
                 __initramfs_start = .;
                         usr/built-in.o(.init.ramfs)
                 __initramfs_end = .;
+#endif
                 . = ALIGN(64);
                 __per_cpu_start = .;
                         *(.data.percpu)
diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
index f6cb74806043..06c9a0507d0d 100644
--- a/arch/arm/mach-at91/clock.c
+++ b/arch/arm/mach-at91/clock.c
@@ -407,7 +407,7 @@ static int at91_clk_open(struct inode *inode, struct file *file)
         return single_open(file, at91_clk_show, NULL);
 }
 
-static struct file_operations at91_clk_operations = {
+static const struct file_operations at91_clk_operations = {
         .open           = at91_clk_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
diff --git a/arch/arm/mach-at91/gpio.c b/arch/arm/mach-at91/gpio.c
index 9b7495cd555d..7b87f3f101b7 100644
--- a/arch/arm/mach-at91/gpio.c
+++ b/arch/arm/mach-at91/gpio.c
@@ -65,6 +65,24 @@ static inline unsigned pin_to_mask(unsigned pin)
 
 
 /*
+ * mux the pin to the "GPIO" peripheral role.
+ */
+int __init_or_module at91_set_GPIO_periph(unsigned pin, int use_pullup)
+{
+        void __iomem    *pio = pin_to_controller(pin);
+        unsigned        mask = pin_to_mask(pin);
+
+        if (!pio)
+                return -EINVAL;
+        __raw_writel(mask, pio + PIO_IDR);
+        __raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR));
+        __raw_writel(mask, pio + PIO_PER);
+        return 0;
+}
+EXPORT_SYMBOL(at91_set_GPIO_periph);
+
+
+/*
  * mux the pin to the "A" internal peripheral role.
  */
 int __init_or_module at91_set_A_periph(unsigned pin, int use_pullup)
@@ -181,6 +199,36 @@ EXPORT_SYMBOL(at91_set_multi_drive);
 
 /*--------------------------------------------------------------------------*/
 
+/* new-style GPIO calls; these expect at91_set_GPIO_periph to have been
+ * called, and maybe at91_set_multi_drive() for putout pins.
+ */
+
+int gpio_direction_input(unsigned pin)
+{
+        void __iomem    *pio = pin_to_controller(pin);
+        unsigned        mask = pin_to_mask(pin);
+
+        if (!pio || !(__raw_readl(pio + PIO_PSR) & mask))
+                return -EINVAL;
+        __raw_writel(mask, pio + PIO_OER);
+        return 0;
+}
+EXPORT_SYMBOL(gpio_direction_input);
+
+int gpio_direction_output(unsigned pin)
+{
+        void __iomem    *pio = pin_to_controller(pin);
+        unsigned        mask = pin_to_mask(pin);
+
+        if (!pio || !(__raw_readl(pio + PIO_PSR) & mask))
+                return -EINVAL;
+        __raw_writel(mask, pio + PIO_OER);
+        return 0;
+}
+EXPORT_SYMBOL(gpio_direction_output);
+
+/*--------------------------------------------------------------------------*/
+
 /*
  * assuming the pin is muxed as a gpio output, set its value.
  */
diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c
index 40039b2a90b3..2703a730baf7 100644
--- a/arch/arm/mach-imx/time.c
+++ b/arch/arm/mach-imx/time.c
@@ -87,7 +87,7 @@ static struct clocksource clocksource_imx = {
         .read           = imx_get_cycles,
         .mask           = 0xFFFFFFFF,
         .shift          = 20,
-        .is_continuous  = 1,
+        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
 static int __init imx_clocksource_init(void)
diff --git a/arch/arm/mach-iop13xx/setup.c b/arch/arm/mach-iop13xx/setup.c
index 5fbeb28d04bb..9a46bcd5f18e 100644
--- a/arch/arm/mach-iop13xx/setup.c
+++ b/arch/arm/mach-iop13xx/setup.c
@@ -24,6 +24,7 @@
 #include <asm/mach/map.h>
 #include <asm/hardware.h>
 #include <asm/irq.h>
+#include <asm/io.h>
 
 #define IOP13XX_UART_XTAL 33334000
 #define IOP13XX_SETUP_DEBUG 0
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index 2ec9a9e9a04d..45068c3d8dcc 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -395,7 +395,7 @@ static struct clocksource clocksource_ixp4xx = {
         .read           = ixp4xx_get_cycles,
         .mask           = CLOCKSOURCE_MASK(32),
         .shift          = 20,
-        .is_continuous  = 1,
+        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
 unsigned long ixp4xx_timer_freq = FREQ;
diff --git a/arch/arm/mach-netx/time.c b/arch/arm/mach-netx/time.c
index 5773b55ef4a6..7e132fcccd47 100644
--- a/arch/arm/mach-netx/time.c
+++ b/arch/arm/mach-netx/time.c
@@ -62,7 +62,7 @@ static struct clocksource clocksource_netx = {
         .read           = netx_get_cycles,
         .mask           = CLOCKSOURCE_MASK(32),
         .shift          = 20,
-        .is_continuous  = 1,
+        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
 /*
diff --git a/arch/arm/mach-pxa/corgi_pm.c b/arch/arm/mach-pxa/corgi_pm.c
index 4c3de4008a43..165017de8d0d 100644
--- a/arch/arm/mach-pxa/corgi_pm.c
+++ b/arch/arm/mach-pxa/corgi_pm.c
@@ -16,7 +16,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
-#include <asm/apm.h>
+#include <asm/apm-emulation.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 #include <asm/hardware.h>
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
index db6e8f56a75f..b1d8cfca245a 100644
--- a/arch/arm/mach-pxa/sharpsl_pm.c
+++ b/arch/arm/mach-pxa/sharpsl_pm.c
@@ -23,7 +23,7 @@
 
 #include <asm/hardware.h>
 #include <asm/mach-types.h>
-#include <asm/apm.h>
+#include <asm/apm-emulation.h>
 #include <asm/arch/pm.h>
 #include <asm/arch/pxa-regs.h>
 #include <asm/arch/sharpsl.h>
diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c
index 40be833079c7..b97d543d9364 100644
--- a/arch/arm/mach-pxa/spitz_pm.c
+++ b/arch/arm/mach-pxa/spitz_pm.c
@@ -16,7 +16,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
-#include <asm/apm.h>
+#include <asm/apm-emulation.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 #include <asm/hardware.h>
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c
index ee2beb400414..fc3b82a740a0 100644
--- a/arch/arm/mach-pxa/time.c
+++ b/arch/arm/mach-pxa/time.c
@@ -112,7 +112,7 @@ static struct clocksource clocksource_pxa = {
         .read           = pxa_get_cycles,
         .mask           = CLOCKSOURCE_MASK(32),
         .shift          = 20,
-        .is_continuous  = 1,
+        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
 static void __init pxa_timer_init(void)
diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c
index 54ecdaa373d6..64067cd58d36 100644
--- a/arch/arm/mach-sa1100/jornada720.c
+++ b/arch/arm/mach-sa1100/jornada720.c
@@ -231,12 +231,6 @@ static struct platform_device *devices[] __initdata = {
         &s1d13xxxfb_device,
 };
 
-/* a stub for now, we theoretically cannot suspend without a flashboard */
-int pm_suspend(suspend_state_t state)
-{
-        return -1;
-}
-
 static int __init jornada720_init(void)
 {
         int ret = -ENODEV;
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 4b277199d0e8..e684e9b38216 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -525,7 +525,7 @@ config CPU_BIG_ENDIAN
           of your chipset/board/processor.
 
 config CPU_HIGH_VECTOR
-        depends !MMU && CPU_CP15 && !CPU_ARM740T
+        depends on !MMU && CPU_CP15 && !CPU_ARM740T
         bool "Select the High exception vector"
         default n
         help
diff --git a/arch/arm/plat-s3c24xx/Kconfig b/arch/arm/plat-s3c24xx/Kconfig
index e22343160634..860869528f4c 100644
--- a/arch/arm/plat-s3c24xx/Kconfig
+++ b/arch/arm/plat-s3c24xx/Kconfig
@@ -8,6 +8,7 @@ config PLAT_S3C24XX
         bool
         depends on ARCH_S3C2410
         default y if ARCH_S3C2410
+        select NO_IOPORT
         help
           Base platform code for any Samsung S3C device