9 files changed, 74 insertions, 34 deletions

diff --git a/arch/arm26/kernel/entry.S b/arch/arm26/kernel/entry.S
index 6d910ea43d34..91496cc687b1 100644
--- a/arch/arm26/kernel/entry.S
+++ b/arch/arm26/kernel/entry.S
@@ -245,11 +245,6 @@ ENTRY(vector_swi)
         zero_fp
         get_scno
 
-#ifdef CONFIG_ALIGNMENT_TRAP
-        ldr     ip, __cr_alignment
-        ldr     ip, [ip]
-        mcr     p15, 0, ip, c1, c0              @ update control register
-#endif
         enable_irqs ip
 
         str     r4, [sp, #-S_OFF]!              @ push fifth arg
@@ -299,11 +294,6 @@ __sys_trace_return:
         b       ret_slow_syscall
 
         .align  5
-#ifdef CONFIG_ALIGNMENT_TRAP
-        .type   __cr_alignment, #object
-__cr_alignment:
-        .word   cr_alignment
-#endif
 
         .type   sys_call_table, #object
 ENTRY(sys_call_table)
diff --git a/arch/cris/arch-v32/drivers/pci/dma.c b/arch/cris/arch-v32/drivers/pci/dma.c
index 426b09878a05..70d3bf0c92e8 100644
--- a/arch/cris/arch-v32/drivers/pci/dma.c
+++ b/arch/cris/arch-v32/drivers/pci/dma.c
@@ -111,7 +111,7 @@ int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
         return DMA_MEMORY_IO;
 
  free1_out:
-        kfree(dev->dma_mem->bitmap);
+        kfree(dev->dma_mem);
  out:
         return 0;
 }
diff --git a/arch/frv/mm/init.c b/arch/frv/mm/init.c
index 3f3a0ed3539b..4103c2c487f3 100644
--- a/arch/frv/mm/init.c
+++ b/arch/frv/mm/init.c
@@ -126,8 +126,7 @@ void __init paging_init(void)
 
         /* distribute the allocatable pages across the various zones and pass them to the allocator
          */
-        zones_size[ZONE_DMA]     = max_low_pfn - min_low_pfn;
-        zones_size[ZONE_NORMAL]  = 0;
+        zones_size[ZONE_NORMAL]  = max_low_pfn - min_low_pfn;
 #ifdef CONFIG_HIGHMEM
         zones_size[ZONE_HIGHMEM] = num_physpages - num_mappedpages;
 #endif
diff --git a/arch/i386/kernel/pci-dma.c b/arch/i386/kernel/pci-dma.c
index 41af692c1584..3ebcea033623 100644
--- a/arch/i386/kernel/pci-dma.c
+++ b/arch/i386/kernel/pci-dma.c
@@ -110,7 +110,7 @@ int dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
         return DMA_MEMORY_IO;
 
  free1_out:
-        kfree(dev->dma_mem->bitmap);
+        kfree(dev->dma_mem);
  out:
         if (mem_base)
                 iounmap(mem_base);
diff --git a/arch/powerpc/platforms/ps3/Kconfig b/arch/powerpc/platforms/ps3/Kconfig
index d270a1e374d5..1a481a60a883 100644
--- a/arch/powerpc/platforms/ps3/Kconfig
+++ b/arch/powerpc/platforms/ps3/Kconfig
@@ -1,9 +1,24 @@
 menu "PS3 Platform Options"
         depends on PPC_PS3
 
+config PS3_ADVANCED
+        depends on PPC_PS3
+        bool "PS3 Advanced configuration options"
+        help
+          This gives you access to some advanced options for the PS3. The
+          defaults should be fine for most users, but these options may make
+          it possible to better control the kernel configuration if you know
+          what you are doing.
+
+          Note that the answer to this question won't directly affect the
+          kernel: saying N will just cause the configurator to skip all
+          the questions about these options.
+
+          Most users should say N to this question.
+
 config PS3_HTAB_SIZE
         depends on PPC_PS3
-        int "PS3 Platform pagetable size"
+        int "PS3 Platform pagetable size" if PS3_ADVANCED
         range 18 20
         default 20
         help
@@ -42,7 +57,7 @@ config PS3_USE_LPAR_ADDR
 
 config PS3_VUART
         depends on PPC_PS3
-        bool "PS3 Virtual UART support"
+        bool "PS3 Virtual UART support" if PS3_ADVANCED
         default y
         help
           Include support for the PS3 Virtual UART.
@@ -52,9 +67,8 @@ config PS3_VUART
           general, all users will say Y.
 
 config PS3_PS3AV
-        tristate "PS3 AV settings driver"
-        depends on PPC_PS3
-        select PS3_VUART
+        tristate "PS3 AV settings driver" if PS3_ADVANCED
+        depends on PS3_VUART
         default y
         help
           Include support for the PS3 AV Settings driver.
@@ -63,8 +77,8 @@ config PS3_PS3AV
           general, all users will say Y or M.
 
 config PS3_SYS_MANAGER
-        bool "PS3 System Manager driver"
-        select PS3_VUART
+        bool "PS3 System Manager driver" if PS3_ADVANCED
+        depends on PS3_VUART
         default y
         help
           Include support for the PS3 System Manager.
diff --git a/arch/um/Kconfig.char b/arch/um/Kconfig.char
index e03e40c7aac3..a5b079d5e865 100644
--- a/arch/um/Kconfig.char
+++ b/arch/um/Kconfig.char
@@ -146,6 +146,25 @@ config LEGACY_PTYS
           security.  This option enables these legacy devices; on most
           systems, it is safe to say N.
 
+config RAW_DRIVER
+        tristate "RAW driver (/dev/raw/rawN) (OBSOLETE)"
+        help
+          The raw driver permits block devices to be bound to /dev/raw/rawN.
+          Once bound, I/O against /dev/raw/rawN uses efficient zero-copy I/O.
+          See the raw(8) manpage for more details.
+
+          The raw driver is deprecated and will be removed soon.
+          Applications should simply open the device (eg /dev/hda1)
+          with the O_DIRECT flag.
+
+config MAX_RAW_DEVS
+        int "Maximum number of RAW devices to support (1-8192)"
+        depends on RAW_DRIVER
+        default "256"
+        help
+          The maximum number of RAW devices that are supported.
+          Default is 256. Increase this number in case you need lots of
+          raw devices.
 
 config LEGACY_PTY_COUNT
         int "Maximum number of legacy PTY in use"
diff --git a/arch/um/os-Linux/elf_aux.c b/arch/um/os-Linux/elf_aux.c
index 3a8d7e3aae0a..608784d4ec57 100644
--- a/arch/um/os-Linux/elf_aux.c
+++ b/arch/um/os-Linux/elf_aux.c
@@ -39,6 +39,9 @@ __init void scan_elf_aux( char **envp)
                 switch ( auxv->a_type ) {
                         case AT_SYSINFO:
                                 __kernel_vsyscall = auxv->a_un.a_val;
+                                /* See if the page is under TASK_SIZE */
+                                if (__kernel_vsyscall < (unsigned long) envp)
+                                        __kernel_vsyscall = 0;
                                 break;
                         case AT_SYSINFO_EHDR:
                                 vsyscall_ehdr = auxv->a_un.a_val;
diff --git a/arch/um/os-Linux/sigio.c b/arch/um/os-Linux/sigio.c
index b2e1fd8e3571..3fc43b33db66 100644
--- a/arch/um/os-Linux/sigio.c
+++ b/arch/um/os-Linux/sigio.c
@@ -334,8 +334,11 @@ void maybe_sigio_broken(int fd, int read)
 
         sigio_lock();
         err = need_poll(&all_sigio_fds, all_sigio_fds.used + 1);
-        if(err)
+        if(err){
+                printk("maybe_sigio_broken - failed to add pollfd for "
+                       "descriptor %d\n", fd);
                 goto out;
+        }
 
         all_sigio_fds.poll[all_sigio_fds.used++] =
                 ((struct pollfd) { .fd          = fd,
diff --git a/arch/um/sys-i386/ldt.c b/arch/um/sys-i386/ldt.c
index 5db7737df0ff..4a8b4202ef9e 100644
--- a/arch/um/sys-i386/ldt.c
+++ b/arch/um/sys-i386/ldt.c
@@ -7,6 +7,7 @@
 #include "linux/slab.h"
 #include "linux/types.h"
 #include "linux/errno.h"
+#include "linux/spinlock.h"
 #include "asm/uaccess.h"
 #include "asm/smp.h"
 #include "asm/ldt.h"
@@ -386,23 +387,33 @@ static long do_modify_ldt_skas(int func, void __user *ptr,
         return ret;
 }
 
-short dummy_list[9] = {0, -1};
-short * host_ldt_entries = NULL;
+static DEFINE_SPINLOCK(host_ldt_lock);
+static short dummy_list[9] = {0, -1};
+static short * host_ldt_entries = NULL;
 
-void ldt_get_host_info(void)
+static void ldt_get_host_info(void)
 {
         long ret;
-        struct ldt_entry * ldt;
+        struct ldt_entry * ldt, *tmp;
         int i, size, k, order;
 
+        spin_lock(&host_ldt_lock);
+
+        if(host_ldt_entries != NULL){
+                spin_unlock(&host_ldt_lock);
+                return;
+        }
         host_ldt_entries = dummy_list+1;
 
+        spin_unlock(&host_ldt_lock);
+
         for(i = LDT_PAGES_MAX-1, order=0; i; i>>=1, order++);
 
         ldt = (struct ldt_entry *)
               __get_free_pages(GFP_KERNEL|__GFP_ZERO, order);
         if(ldt == NULL) {
-                printk("ldt_get_host_info: couldn't allocate buffer for host ldt\n");
+                printk("ldt_get_host_info: couldn't allocate buffer for host "
+                       "ldt\n");
                 return;
         }
 
@@ -426,11 +437,13 @@ void ldt_get_host_info(void)
                 host_ldt_entries = dummy_list;
         else {
                 size = (size + 1) * sizeof(dummy_list[0]);
-                host_ldt_entries = kmalloc(size, GFP_KERNEL);
-                if(host_ldt_entries == NULL) {
-                        printk("ldt_get_host_info: couldn't allocate host ldt list\n");
+                tmp = kmalloc(size, GFP_KERNEL);
+                if(tmp == NULL) {
+                        printk("ldt_get_host_info: couldn't allocate host ldt "
+                               "list\n");
                         goto out_free;
                 }
+                host_ldt_entries = tmp;
         }
 
         for(i=0, k=0; i<ret/LDT_ENTRY_SIZE; i++){
@@ -480,8 +493,7 @@ long init_new_ldt(struct mmu_context_skas * new_mm,
                          * inherited from the host. All ldt-entries found
                          * will be reset in the following loop
                          */
-                        if(host_ldt_entries == NULL)
-                                ldt_get_host_info();
+                        ldt_get_host_info();
                         for(num_p=host_ldt_entries; *num_p != -1; num_p++){
                                 desc.entry_number = *num_p;
                                 err = write_ldt_entry(&new_mm->id, 1, &desc,
@@ -560,6 +572,6 @@ void free_ldt(struct mmu_context_skas * mm)
 
 int sys_modify_ldt(int func, void __user *ptr, unsigned long bytecount)
 {
-        return(CHOOSE_MODE_PROC(do_modify_ldt_tt, do_modify_ldt_skas, func,
-                                ptr, bytecount));
+        return CHOOSE_MODE_PROC(do_modify_ldt_tt, do_modify_ldt_skas, func,
+                                ptr, bytecount);
 }