26 files changed, 127 insertions, 140 deletions

diff --git a/Documentation/gpio.txt b/Documentation/gpio.txt
index 218a8650f48d..6bc2ba215df9 100644
--- a/Documentation/gpio.txt
+++ b/Documentation/gpio.txt
@@ -148,7 +148,7 @@ pin ... that won't always match the specified output value, because of
 issues including wire-OR and output latencies.
 
 The get/set calls have no error returns because "invalid GPIO" should have
-been reported earlier in gpio_set_direction().  However, note that not all
+been reported earlier from gpio_direction_*().  However, note that not all
 platforms can read the value of output pins; those that can't should always
 return zero.  Also, using these calls for GPIOs that can't safely be accessed
 without sleeping (see below) is an error.
@@ -239,7 +239,7 @@ map between them using calls like:
 Those return either the corresponding number in the other namespace, or
 else a negative errno code if the mapping can't be done.  (For example,
 some GPIOs can't used as IRQs.)  It is an unchecked error to use a GPIO
-number that hasn't been marked as an input using gpio_set_direction(), or
+number that wasn't set up as an input using gpio_direction_input(), or
 to use an IRQ number that didn't originally come from gpio_to_irq().
 
 These two mapping calls are expected to cost on the order of a single
diff --git a/Documentation/lguest/Makefile b/Documentation/lguest/Makefile
index b9b9427376e9..31e794ef5f98 100644
--- a/Documentation/lguest/Makefile
+++ b/Documentation/lguest/Makefile
@@ -11,8 +11,7 @@ endif
 include $(KBUILD_OUTPUT)/.config
 LGUEST_GUEST_TOP := ($(CONFIG_PAGE_OFFSET) - 0x08000000)
 
-CFLAGS:=-Wall -Wmissing-declarations -Wmissing-prototypes -O3 \
-        -static -DLGUEST_GUEST_TOP="$(LGUEST_GUEST_TOP)" -Wl,-T,lguest.lds
+CFLAGS:=-Wall -Wmissing-declarations -Wmissing-prototypes -O3 -Wl,-T,lguest.lds
 LDLIBS:=-lz
 
 all: lguest.lds lguest
diff --git a/Documentation/lguest/lguest.c b/Documentation/lguest/lguest.c
index 1432b502a2d9..62a8133393e1 100644
--- a/Documentation/lguest/lguest.c
+++ b/Documentation/lguest/lguest.c
@@ -47,12 +47,14 @@ static bool verbose;
 #define verbose(args...) \
         do { if (verbose) printf(args); } while(0)
 static int waker_fd;
+static u32 top;
 
 struct device_list
 {
         fd_set infds;
         int max_infd;
 
+        struct lguest_device_desc *descs;
         struct device *dev;
         struct device **lastdev;
 };
@@ -324,8 +326,7 @@ static void concat(char *dst, char *args[])
 static int tell_kernel(u32 pgdir, u32 start, u32 page_offset)
 {
         u32 args[] = { LHREQ_INITIALIZE,
-                       LGUEST_GUEST_TOP/getpagesize(), /* Just below us */
-                       pgdir, start, page_offset };
+                       top/getpagesize(), pgdir, start, page_offset };
         int fd;
 
         fd = open_or_die("/dev/lguest", O_RDWR);
@@ -382,7 +383,7 @@ static int setup_waker(int lguest_fd, struct device_list *device_list)
 static void *_check_pointer(unsigned long addr, unsigned int size,
                             unsigned int line)
 {
-        if (addr >= LGUEST_GUEST_TOP || addr + size >= LGUEST_GUEST_TOP)
+        if (addr >= top || addr + size >= top)
                 errx(1, "%s:%i: Invalid address %li", __FILE__, line, addr);
         return (void *)addr;
 }
@@ -629,24 +630,26 @@ static void handle_input(int fd, struct device_list *devices)
         }
 }
 
-static struct lguest_device_desc *new_dev_desc(u16 type, u16 features,
-                                               u16 num_pages)
+static struct lguest_device_desc *
+new_dev_desc(struct lguest_device_desc *descs,
+             u16 type, u16 features, u16 num_pages)
 {
-        static unsigned long top = LGUEST_GUEST_TOP;
-        struct lguest_device_desc *desc;
+        unsigned int i;
 
-        desc = malloc(sizeof(*desc));
-        desc->type = type;
-        desc->num_pages = num_pages;
-        desc->features = features;
-        desc->status = 0;
-        if (num_pages) {
-                top -= num_pages*getpagesize();
-                map_zeroed_pages(top, num_pages);
-                desc->pfn = top / getpagesize();
-        } else
-                desc->pfn = 0;
-        return desc;
+        for (i = 0; i < LGUEST_MAX_DEVICES; i++) {
+                if (!descs[i].type) {
+                        descs[i].type = type;
+                        descs[i].features = features;
+                        descs[i].num_pages = num_pages;
+                        if (num_pages) {
+                                map_zeroed_pages(top, num_pages);
+                                descs[i].pfn = top/getpagesize();
+                                top += num_pages*getpagesize();
+                        }
+                        return &descs[i];
+                }
+        }
+        errx(1, "too many devices");
 }
 
 static struct device *new_device(struct device_list *devices,
@@ -669,7 +672,7 @@ static struct device *new_device(struct device_list *devices,
         dev->fd = fd;
         if (handle_input)
                 set_fd(dev->fd, devices);
-        dev->desc = new_dev_desc(type, features, num_pages);
+        dev->desc = new_dev_desc(devices->descs, type, features, num_pages);
         dev->mem = (void *)(dev->desc->pfn * getpagesize());
         dev->handle_input = handle_input;
         dev->watch_key = (unsigned long)dev->mem + watch_off;
@@ -866,30 +869,6 @@ static void setup_tun_net(const char *arg, struct device_list *devices)
                 verbose("attached to bridge: %s\n", br_name);
 }
 
-/* Now we know how much memory we have, we copy in device descriptors */
-static void map_device_descriptors(struct device_list *devs, unsigned long mem)
-{
-        struct device *i;
-        unsigned int num;
-        struct lguest_device_desc *descs;
-
-        /* Device descriptor array sits just above top of normal memory */
-        descs = map_zeroed_pages(mem, 1);
-
-        for (i = devs->dev, num = 0; i; i = i->next, num++) {
-                if (num == LGUEST_MAX_DEVICES)
-                        errx(1, "too many devices");
-                verbose("Device %i: %s\n", num,
-                        i->desc->type == LGUEST_DEVICE_T_NET ? "net"
-                        : i->desc->type == LGUEST_DEVICE_T_CONSOLE ? "console"
-                        : i->desc->type == LGUEST_DEVICE_T_BLOCK ? "block"
-                        : "unknown");
-                descs[num] = *i->desc;
-                free(i->desc);
-                i->desc = &descs[num];
-        }
-}
-
 static void __attribute__((noreturn))
 run_guest(int lguest_fd, struct device_list *device_list)
 {
@@ -934,8 +913,8 @@ static void usage(void)
 
 int main(int argc, char *argv[])
 {
-        unsigned long mem, pgdir, start, page_offset, initrd_size = 0;
-        int c, lguest_fd;
+        unsigned long mem = 0, pgdir, start, page_offset, initrd_size = 0;
+        int i, c, lguest_fd;
         struct device_list device_list;
         void *boot = (void *)0;
         const char *initrd_name = NULL;
@@ -945,6 +924,15 @@ int main(int argc, char *argv[])
         device_list.lastdev = &device_list.dev;
         FD_ZERO(&device_list.infds);
 
+        /* We need to know how much memory so we can allocate devices. */
+        for (i = 1; i < argc; i++) {
+                if (argv[i][0] != '-') {
+                        mem = top = atoi(argv[i]) * 1024 * 1024;
+                        device_list.descs = map_zeroed_pages(top, 1);
+                        top += getpagesize();
+                        break;
+                }
+        }
         while ((c = getopt_long(argc, argv, "v", opts, NULL)) != EOF) {
                 switch (c) {
                 case 'v':
@@ -974,16 +962,12 @@ int main(int argc, char *argv[])
         setup_console(&device_list);
 
         /* First we map /dev/zero over all of guest-physical memory. */
-        mem = atoi(argv[optind]) * 1024 * 1024;
         map_zeroed_pages(0, mem / getpagesize());
 
         /* Now we load the kernel */
         start = load_kernel(open_or_die(argv[optind+1], O_RDONLY),
                             &page_offset);
 
-        /* Write the device descriptors into memory. */
-        map_device_descriptors(&device_list, mem);
-
         /* Map the initrd image if requested */
         if (initrd_name) {
                 initrd_size = load_initrd(initrd_name, mem);
diff --git a/arch/powerpc/platforms/cell/spufs/spufs.h b/arch/powerpc/platforms/cell/spufs/spufs.h
index 8b20c0c1556f..2bfdeb8ea8bd 100644
--- a/arch/powerpc/platforms/cell/spufs/spufs.h
+++ b/arch/powerpc/platforms/cell/spufs/spufs.h
@@ -40,13 +40,10 @@ enum {
 struct spu_context_ops;
 struct spu_gang;
 
-enum {
-        SPU_SCHED_WAS_ACTIVE,   /* was active upon spu_acquire_saved()  */
-};
-
 /* ctx->sched_flags */
 enum {
         SPU_SCHED_NOTIFY_ACTIVE,
+        SPU_SCHED_WAS_ACTIVE,   /* was active upon spu_acquire_saved()  */
 };
 
 struct spu_context {
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
index 542c9ef858f8..d87090507401 100644
--- a/arch/um/drivers/mconsole_kern.c
+++ b/arch/um/drivers/mconsole_kern.c
@@ -499,7 +499,7 @@ static struct mc_device mem_mc = {
         .remove         = mem_remove,
 };
 
-static int mem_mc_init(void)
+static int __init mem_mc_init(void)
 {
         if(can_drop_memory())
                 mconsole_register_dev(&mem_mc);
@@ -798,7 +798,7 @@ void mconsole_stack(struct mc_request *req)
  */
 static char *notify_socket = NULL;
 
-static int mconsole_init(void)
+static int __init mconsole_init(void)
 {
         /* long to avoid size mismatch warnings from gcc */
         long sock;
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 72773dd54425..d35d0c1ee7f4 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -623,7 +623,7 @@ static int eth_setup_common(char *str, int index)
         return found;
 }
 
-static int eth_setup(char *str)
+static int __init eth_setup(char *str)
 {
         struct eth_init *new;
         char *error;
diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
index 72ff85693a39..d2b11f242698 100644
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c
@@ -62,7 +62,7 @@ static void setup_highmem(unsigned long highmem_start,
 }
 #endif
 
-void mem_init(void)
+void __init mem_init(void)
 {
         /* clear the zero-page */
         memset((void *) empty_zero_page, 0, PAGE_SIZE);
diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c
index 3ba6e4c841da..5ee7e851bbc1 100644
--- a/arch/um/kernel/physmem.c
+++ b/arch/um/kernel/physmem.c
@@ -28,7 +28,8 @@ unsigned long high_physmem;
 
 extern unsigned long long physmem_size;
 
-int init_maps(unsigned long physmem, unsigned long iomem, unsigned long highmem)
+int __init init_maps(unsigned long physmem, unsigned long iomem,
+                     unsigned long highmem)
 {
         struct page *p, *map;
         unsigned long phys_len, phys_pages, highmem_len, highmem_pages;
@@ -47,13 +48,7 @@ int init_maps(unsigned long physmem, unsigned long iomem, unsigned long highmem)
         total_pages = phys_pages + iomem_pages + highmem_pages;
         total_len = phys_len + iomem_len + highmem_len;
 
-        if(kmalloc_ok){
-                map = kmalloc(total_len, GFP_KERNEL);
-                if(map == NULL)
-                        map = vmalloc(total_len);
-        }
-        else map = alloc_bootmem_low_pages(total_len);
-
+        map = alloc_bootmem_low_pages(total_len);
         if(map == NULL)
                 return -ENOMEM;
 
@@ -98,8 +93,8 @@ void map_memory(unsigned long virt, unsigned long phys, unsigned long len,
 
 extern int __syscall_stub_start;
 
-void setup_physmem(unsigned long start, unsigned long reserve_end,
-                   unsigned long len, unsigned long long highmem)
+void __init setup_physmem(unsigned long start, unsigned long reserve_end,
+                          unsigned long len, unsigned long long highmem)
 {
         unsigned long reserve = reserve_end - start;
         int pfn = PFN_UP(__pa(reserve_end));
diff --git a/arch/um/kernel/skas/process.c b/arch/um/kernel/skas/process.c
index 2a69a7ce5792..48051a98525f 100644
--- a/arch/um/kernel/skas/process.c
+++ b/arch/um/kernel/skas/process.c
@@ -145,7 +145,7 @@ void init_idle_skas(void)
 
 extern void start_kernel(void);
 
-static int start_kernel_proc(void *unused)
+static int __init start_kernel_proc(void *unused)
 {
         int pid;
 
@@ -165,7 +165,7 @@ extern int userspace_pid[];
 
 extern char cpu0_irqstack[];
 
-int start_uml_skas(void)
+int __init start_uml_skas(void)
 {
         stack_protections((unsigned long) &cpu0_irqstack);
         set_sigstack(cpu0_irqstack, THREAD_SIZE);
diff --git a/arch/um/os-Linux/aio.c b/arch/um/os-Linux/aio.c
index b126df4ea168..59348359f9ab 100644
--- a/arch/um/os-Linux/aio.c
+++ b/arch/um/os-Linux/aio.c
@@ -14,6 +14,7 @@
 #include "init.h"
 #include "user.h"
 #include "mode.h"
+#include "kern_constants.h"
 
 struct aio_thread_req {
         enum aio_type type;
@@ -65,47 +66,33 @@ static long io_getevents(aio_context_t ctx_id, long min_nr, long nr,
 static int do_aio(aio_context_t ctx, enum aio_type type, int fd, char *buf,
                   int len, unsigned long long offset, struct aio_context *aio)
 {
-        struct iocb iocb, *iocbp = &iocb;
+        struct iocb *iocbp = & ((struct iocb) {
+                                    .aio_data       = (unsigned long) aio,
+                                    .aio_fildes     = fd,
+                                    .aio_buf        = (unsigned long) buf,
+                                    .aio_nbytes     = len,
+                                    .aio_offset     = offset
+                             });
         char c;
-        int err;
 
-        iocb = ((struct iocb) { .aio_data       = (unsigned long) aio,
-                                .aio_reqprio    = 0,
-                                .aio_fildes     = fd,
-                                .aio_buf        = (unsigned long) buf,
-                                .aio_nbytes     = len,
-                                .aio_offset     = offset,
-                                .aio_reserved1  = 0,
-                                .aio_reserved2  = 0,
-                                .aio_reserved3  = 0 });
-
-        switch(type){
+        switch (type) {
         case AIO_READ:
-                iocb.aio_lio_opcode = IOCB_CMD_PREAD;
-                err = io_submit(ctx, 1, &iocbp);
+                iocbp->aio_lio_opcode = IOCB_CMD_PREAD;
                 break;
         case AIO_WRITE:
-                iocb.aio_lio_opcode = IOCB_CMD_PWRITE;
-                err = io_submit(ctx, 1, &iocbp);
+                iocbp->aio_lio_opcode = IOCB_CMD_PWRITE;
                 break;
         case AIO_MMAP:
-                iocb.aio_lio_opcode = IOCB_CMD_PREAD;
-                iocb.aio_buf = (unsigned long) &c;
-                iocb.aio_nbytes = sizeof(c);
-                err = io_submit(ctx, 1, &iocbp);
+                iocbp->aio_lio_opcode = IOCB_CMD_PREAD;
+                iocbp->aio_buf = (unsigned long) &c;
+                iocbp->aio_nbytes = sizeof(c);
                 break;
         default:
-                printk("Bogus op in do_aio - %d\n", type);
-                err = -EINVAL;
-                break;
+                printk(UM_KERN_ERR "Bogus op in do_aio - %d\n", type);
+                return -EINVAL;
         }
 
-        if(err > 0)
-                err = 0;
-        else
-                err = -errno;
-
-        return err;
+        return (io_submit(ctx, 1, &iocbp) > 0) ? 0 : -errno;
 }
 
 /* Initialized in an initcall and unchanged thereafter */
diff --git a/arch/um/os-Linux/process.c b/arch/um/os-Linux/process.c
index 2d9d2ca39299..e9c143297512 100644
--- a/arch/um/os-Linux/process.c
+++ b/arch/um/os-Linux/process.c
@@ -194,7 +194,7 @@ int os_unmap_memory(void *addr, int len)
 #define MADV_REMOVE KERNEL_MADV_REMOVE
 #endif
 
-int __init os_drop_memory(void *addr, int length)
+int os_drop_memory(void *addr, int length)
 {
         int err;
 
diff --git a/arch/um/os-Linux/user_syms.c b/arch/um/os-Linux/user_syms.c
index 419b2d5ff6de..4c37b1b1d0b5 100644
--- a/arch/um/os-Linux/user_syms.c
+++ b/arch/um/os-Linux/user_syms.c
@@ -19,10 +19,7 @@ extern void *memmove(void *, const void *, size_t);
 extern void *memset(void *, int, size_t);
 extern int printf(const char *, ...);
 
-/* If they're not defined, the export is included in lib/string.c.*/
-#ifdef __HAVE_ARCH_STRLEN
-EXPORT_SYMBOL(strlen);
-#endif
+/* If it's not defined, the export is included in lib/string.c.*/
 #ifdef __HAVE_ARCH_STRSTR
 EXPORT_SYMBOL(strstr);
 #endif
diff --git a/arch/um/sys-i386/Makefile b/arch/um/sys-i386/Makefile
index 098720be019a..d6b3ecd4b77e 100644
--- a/arch/um/sys-i386/Makefile
+++ b/arch/um/sys-i386/Makefile
@@ -4,7 +4,7 @@ obj-y = bug.o bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \
 
 obj-$(CONFIG_MODE_SKAS) += stub.o stub_segv.o
 
-subarch-obj-y = lib/bitops.o lib/semaphore.o
+subarch-obj-y = lib/bitops.o lib/semaphore.o lib/string.o
 subarch-obj-$(CONFIG_HIGHMEM) += mm/highmem.o
 subarch-obj-$(CONFIG_MODULES) += kernel/module.o
 
diff --git a/drivers/misc/asus-laptop.c b/drivers/misc/asus-laptop.c
index f75306059971..6b89854bd3ff 100644
--- a/drivers/misc/asus-laptop.c
+++ b/drivers/misc/asus-laptop.c
@@ -1067,19 +1067,16 @@ static void asus_backlight_exit(void)
 }
 
 #define  ASUS_LED_UNREGISTER(object)                            \
-        if(object##_led.class_dev                               \
-           && !IS_ERR(object##_led.class_dev))                  \
-                led_classdev_unregister(&object##_led)
+        led_classdev_unregister(&object##_led)
 
 static void asus_led_exit(void)
 {
+        destroy_workqueue(led_workqueue);
         ASUS_LED_UNREGISTER(mled);
         ASUS_LED_UNREGISTER(tled);
         ASUS_LED_UNREGISTER(pled);
         ASUS_LED_UNREGISTER(rled);
         ASUS_LED_UNREGISTER(gled);
-
-        destroy_workqueue(led_workqueue);
 }
 
 static void __exit asus_laptop_exit(void)
@@ -1135,29 +1132,42 @@ static int asus_led_init(struct device *dev)
 
         rv = ASUS_LED_REGISTER(mled, dev);
         if (rv)
-                return rv;
+                goto out;
 
         rv = ASUS_LED_REGISTER(tled, dev);
         if (rv)
-                return rv;
+                goto out1;
 
         rv = ASUS_LED_REGISTER(rled, dev);
         if (rv)
-                return rv;
+                goto out2;
 
         rv = ASUS_LED_REGISTER(pled, dev);
         if (rv)
-                return rv;
+                goto out3;
 
         rv = ASUS_LED_REGISTER(gled, dev);
         if (rv)
-                return rv;
+                goto out4;
 
         led_workqueue = create_singlethread_workqueue("led_workqueue");
         if (!led_workqueue)
-                return -ENOMEM;
+                goto out5;
 
         return 0;
+out5:
+        rv = -ENOMEM;
+        ASUS_LED_UNREGISTER(gled);
+out4:
+        ASUS_LED_UNREGISTER(pled);
+out3:
+        ASUS_LED_UNREGISTER(rled);
+out2:
+        ASUS_LED_UNREGISTER(tled);
+out1:
+        ASUS_LED_UNREGISTER(mled);
+out:
+        return rv;
 }
 
 static int __init asus_laptop_init(void)
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 0b3ec38ae614..2f5a5ac1b271 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -2650,8 +2650,9 @@ static int __devinit serial8250_probe(struct platform_device *dev)
                 ret = serial8250_register_port(&port);
                 if (ret < 0) {
                         dev_err(&dev->dev, "unable to register port at index %d "
-                                "(IO%lx MEM%lx IRQ%d): %d\n", i,
-                                p->iobase, p->mapbase, p->irq, ret);
+                                "(IO%lx MEM%llx IRQ%d): %d\n", i,
+                                p->iobase, (unsigned long long)p->mapbase,
+                                p->irq, ret);
                 }
         }
         return 0;
diff --git a/drivers/serial/8250_early.c b/drivers/serial/8250_early.c
index 947c20507e1f..150cad5c2eba 100644
--- a/drivers/serial/8250_early.c
+++ b/drivers/serial/8250_early.c
@@ -151,8 +151,9 @@ static int __init parse_options(struct early_serial8250_device *device, char *op
 #else
                 port->membase = ioremap(port->mapbase, 64);
                 if (!port->membase) {
-                        printk(KERN_ERR "%s: Couldn't ioremap 0x%lx\n",
-                                __FUNCTION__, port->mapbase);
+                        printk(KERN_ERR "%s: Couldn't ioremap 0x%llx\n",
+                                __FUNCTION__,
+                               (unsigned long long)port->mapbase);
                         return -ENOMEM;
                 }
 #endif
@@ -175,9 +176,10 @@ static int __init parse_options(struct early_serial8250_device *device, char *op
                         device->baud);
         }
 
-        printk(KERN_INFO "Early serial console at %s 0x%lx (options '%s')\n",
+        printk(KERN_INFO "Early serial console at %s 0x%llx (options '%s')\n",
                 mmio ? "MMIO" : "I/O port",
-                mmio ? port->mapbase : (unsigned long) port->iobase,
+                mmio ? (unsigned long long) port->mapbase
+                     : (unsigned long long) port->iobase,
                 device->options);
         return 0;
 }
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 9c57486c2e7f..030a6063541d 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -626,7 +626,7 @@ static int uart_get_info(struct uart_state *state,
         tmp.hub6            = port->hub6;
         tmp.io_type         = port->iotype;
         tmp.iomem_reg_shift = port->regshift;
-        tmp.iomem_base      = (void *)port->mapbase;
+        tmp.iomem_base      = (void *)(unsigned long)port->mapbase;
 
         if (copy_to_user(retinfo, &tmp, sizeof(*retinfo)))
                 return -EFAULT;
@@ -1666,10 +1666,11 @@ static int uart_line_info(char *buf, struct uart_driver *drv, int i)
                 return 0;
 
         mmio = port->iotype >= UPIO_MEM;
-        ret = sprintf(buf, "%d: uart:%s %s%08lX irq:%d",
+        ret = sprintf(buf, "%d: uart:%s %s%08llX irq:%d",
                         port->line, uart_type(port),
                         mmio ? "mmio:0x" : "port:",
-                        mmio ? port->mapbase : (unsigned long) port->iobase,
+                        mmio ? (unsigned long long)port->mapbase
+                             : (unsigned long long) port->iobase,
                         port->irq);
 
         if (port->type == PORT_UNKNOWN) {
@@ -2069,7 +2070,7 @@ uart_report_port(struct uart_driver *drv, struct uart_port *port)
         case UPIO_TSI:
         case UPIO_DWAPB:
                 snprintf(address, sizeof(address),
-                         "MMIO 0x%lx", port->mapbase);
+                         "MMIO 0x%llx", (unsigned long long)port->mapbase);
                 break;
         default:
                 strlcpy(address, "*unknown*", sizeof(address));
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 564cc9b51822..a7231d171bd5 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1571,7 +1571,14 @@ config FB_PM3
 
 config FB_AU1100
         bool "Au1100 LCD Driver"
-        depends on (FB = y) && EXPERIMENTAL && PCI && MIPS && MIPS_PB1100=y
+        depends on (FB = y) && MIPS && SOC_AU1100
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        help
+          This is the framebuffer driver for the AMD Au1100 SOC.  It can drive
+          various panels and CRTs by passing in kernel cmd line option
+          au1100fb:panel=<name>.
 
 config FB_AU1200
         bool "Au1200 LCD Driver"
diff --git a/fs/open.c b/fs/open.c
index a6b054edacba..e27c205364d3 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -403,7 +403,7 @@ asmlinkage long sys_fallocate(int fd, int mode, loff_t offset, loff_t len)
         if (inode->i_op && inode->i_op->fallocate)
                 ret = inode->i_op->fallocate(inode, mode, offset, len);
         else
-                ret = -ENOSYS;
+                ret = -EOPNOTSUPP;
 
 out_fput:
         fput(file);
diff --git a/include/asm-xtensa/io.h b/include/asm-xtensa/io.h
index 31ffc3f119c1..0faa614d9696 100644
--- a/include/asm-xtensa/io.h
+++ b/include/asm-xtensa/io.h
@@ -13,6 +13,7 @@
 
 #ifdef __KERNEL__
 #include <asm/byteorder.h>
+#include <asm/page.h>
 
 #include <linux/types.h>
 
diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h
index 8518fa2a6f89..afe0f6d9b9bc 100644
--- a/include/linux/serial_8250.h
+++ b/include/linux/serial_8250.h
@@ -20,7 +20,7 @@
 struct plat_serial8250_port {
         unsigned long   iobase;         /* io base address */
         void __iomem    *membase;       /* ioremap cookie or NULL */
-        unsigned long   mapbase;        /* resource base */
+        resource_size_t mapbase;        /* resource base */
         unsigned int    irq;            /* interrupt number */
         unsigned int    uartclk;        /* UART clock rate */
         unsigned char   regshift;       /* register shift */
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 773d8d8828ad..09d17b06bf02 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -288,7 +288,7 @@ struct uart_port {
         const struct uart_ops   *ops;
         unsigned int            custom_divisor;
         unsigned int            line;                   /* port index */
-        unsigned long           mapbase;                /* for ioremap */
+        resource_size_t         mapbase;                /* for ioremap */
         struct device           *dev;                   /* parent device */
         unsigned char           hub6;                   /* this should be in the 8250 driver */
         unsigned char           unused[3];
diff --git a/lib/fault-inject.c b/lib/fault-inject.c
index b18fc2ff9ffe..23985a278bbb 100644
--- a/lib/fault-inject.c
+++ b/lib/fault-inject.c
@@ -139,12 +139,14 @@ static void debugfs_ul_set(void *data, u64 val)
         *(unsigned long *)data = val;
 }
 
+#ifdef CONFIG_FAULT_INJECTION_STACKTRACE_FILTER
 static void debugfs_ul_set_MAX_STACK_TRACE_DEPTH(void *data, u64 val)
 {
         *(unsigned long *)data =
                 val < MAX_STACK_TRACE_DEPTH ?
                 val : MAX_STACK_TRACE_DEPTH;
 }
+#endif /* CONFIG_FAULT_INJECTION_STACKTRACE_FILTER */
 
 static u64 debugfs_ul_get(void *data)
 {
@@ -159,6 +161,7 @@ static struct dentry *debugfs_create_ul(const char *name, mode_t mode,
         return debugfs_create_file(name, mode, parent, value, &fops_ul);
 }
 
+#ifdef CONFIG_FAULT_INJECTION_STACKTRACE_FILTER
 DEFINE_SIMPLE_ATTRIBUTE(fops_ul_MAX_STACK_TRACE_DEPTH, debugfs_ul_get,
                         debugfs_ul_set_MAX_STACK_TRACE_DEPTH, "%llu\n");
 
@@ -169,6 +172,7 @@ static struct dentry *debugfs_create_ul_MAX_STACK_TRACE_DEPTH(
         return debugfs_create_file(name, mode, parent, value,
                                    &fops_ul_MAX_STACK_TRACE_DEPTH);
 }
+#endif /* CONFIG_FAULT_INJECTION_STACKTRACE_FILTER */
 
 static void debugfs_atomic_t_set(void *data, u64 val)
 {
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index f127940ec24f..d7ca59d66c59 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -84,6 +84,7 @@ static struct page *dequeue_huge_page(struct vm_area_struct *vma,
                         list_del(&page->lru);
                         free_huge_pages--;
                         free_huge_pages_node[nid]--;
+                        break;
                 }
         }
         return page;
diff --git a/mm/slab.c b/mm/slab.c
index bde271c001ba..a684778b2b41 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -2776,7 +2776,7 @@ static int cache_grow(struct kmem_cache *cachep,
          * 'nodeid'.
          */
         if (!objp)
-                objp = kmem_getpages(cachep, flags, nodeid);
+                objp = kmem_getpages(cachep, local_flags, nodeid);
         if (!objp)
                 goto failed;
 
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index 490697542fc2..dc2f41e9f577 100644
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -769,11 +769,12 @@ svcauth_gss_register_pseudoflavor(u32 pseudoflavor, char * name)
         new->h.flavour = &svcauthops_gss;
         new->pseudoflavor = pseudoflavor;
 
+        stat = 0;
         test = auth_domain_lookup(name, &new->h);
-        if (test != &new->h) { /* XXX Duplicate registration? */
-                auth_domain_put(&new->h);
-                /* dangling ref-count... */
-                goto out;
+        if (test != &new->h) { /* Duplicate registration */
+                auth_domain_put(test);
+                kfree(new->h.name);
+                goto out_free_dom;
         }
         return 0;