Merge branch 'master' of /usr/src/ntfs-2.6/

9 files changed, 148 insertions, 51 deletions

diff --git a/arch/i386/kernel/cpuid.c b/arch/i386/kernel/cpuid.c
index 4647db4ad6de..13bae799e626 100644
--- a/arch/i386/kernel/cpuid.c
+++ b/arch/i386/kernel/cpuid.c
@@ -163,7 +163,7 @@ static int cpuid_class_device_create(int i)
         int err = 0;
         struct class_device *class_err;
 
-        class_err = class_device_create(cpuid_class, MKDEV(CPUID_MAJOR, i), NULL, "cpu%d",i);
+        class_err = class_device_create(cpuid_class, NULL, MKDEV(CPUID_MAJOR, i), NULL, "cpu%d",i);
         if (IS_ERR(class_err))
                 err = PTR_ERR(class_err);
         return err;
diff --git a/arch/i386/kernel/msr.c b/arch/i386/kernel/msr.c
index 03100d6fc5d6..44470fea4309 100644
--- a/arch/i386/kernel/msr.c
+++ b/arch/i386/kernel/msr.c
@@ -246,7 +246,7 @@ static int msr_class_device_create(int i)
         int err = 0;
         struct class_device *class_err;
 
-        class_err = class_device_create(msr_class, MKDEV(MSR_MAJOR, i), NULL, "msr%d",i);
+        class_err = class_device_create(msr_class, NULL, MKDEV(MSR_MAJOR, i), NULL, "msr%d",i);
         if (IS_ERR(class_err)) 
                 err = PTR_ERR(class_err);
         return err;
diff --git a/arch/i386/kernel/vm86.c b/arch/i386/kernel/vm86.c
index 16b485009622..fc1993564f98 100644
--- a/arch/i386/kernel/vm86.c
+++ b/arch/i386/kernel/vm86.c
@@ -134,17 +134,16 @@ struct pt_regs * fastcall save_v86_state(struct kernel_vm86_regs * regs)
         return ret;
 }
 
-static void mark_screen_rdonly(struct task_struct * tsk)
+static void mark_screen_rdonly(struct mm_struct *mm)
 {
         pgd_t *pgd;
         pud_t *pud;
         pmd_t *pmd;
-        pte_t *pte, *mapped;
+        pte_t *pte;
+        spinlock_t *ptl;
         int i;
 
-        preempt_disable();
-        spin_lock(&tsk->mm->page_table_lock);
-        pgd = pgd_offset(tsk->mm, 0xA0000);
+        pgd = pgd_offset(mm, 0xA0000);
         if (pgd_none_or_clear_bad(pgd))
                 goto out;
         pud = pud_offset(pgd, 0xA0000);
@@ -153,16 +152,14 @@ static void mark_screen_rdonly(struct task_struct * tsk)
         pmd = pmd_offset(pud, 0xA0000);
         if (pmd_none_or_clear_bad(pmd))
                 goto out;
-        pte = mapped = pte_offset_map(pmd, 0xA0000);
+        pte = pte_offset_map_lock(mm, pmd, 0xA0000, &ptl);
         for (i = 0; i < 32; i++) {
                 if (pte_present(*pte))
                         set_pte(pte, pte_wrprotect(*pte));
                 pte++;
         }
-        pte_unmap(mapped);
+        pte_unmap_unlock(pte, ptl);
 out:
-        spin_unlock(&tsk->mm->page_table_lock);
-        preempt_enable();
         flush_tlb();
 }
 
@@ -306,7 +303,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
 
         tsk->thread.screen_bitmap = info->screen_bitmap;
         if (info->flags & VM86_SCREEN_BITMAP)
-                mark_screen_rdonly(tsk);
+                mark_screen_rdonly(tsk->mm);
         __asm__ __volatile__(
                 "xorl %%eax,%%eax; movl %%eax,%%fs; movl %%eax,%%gs\n\t"
                 "movl %0,%%esp\n\t"
diff --git a/arch/i386/mm/discontig.c b/arch/i386/mm/discontig.c
index 244d8ec66be2..c4af9638dbfa 100644
--- a/arch/i386/mm/discontig.c
+++ b/arch/i386/mm/discontig.c
@@ -98,7 +98,7 @@ unsigned long node_memmap_size_bytes(int nid, unsigned long start_pfn,
 
 extern unsigned long find_max_low_pfn(void);
 extern void find_max_pfn(void);
-extern void one_highpage_init(struct page *, int, int);
+extern void add_one_highpage_init(struct page *, int, int);
 
 extern struct e820map e820;
 extern unsigned long init_pg_tables_end;
@@ -427,7 +427,7 @@ void __init set_highmem_pages_init(int bad_ppro)
                         if (!pfn_valid(node_pfn))
                                 continue;
                         page = pfn_to_page(node_pfn);
-                        one_highpage_init(page, node_pfn, bad_ppro);
+                        add_one_highpage_init(page, node_pfn, bad_ppro);
                 }
         }
         totalram_pages += totalhigh_pages;
diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c
index 2ebaf75f732e..542d9298da5e 100644
--- a/arch/i386/mm/init.c
+++ b/arch/i386/mm/init.c
@@ -27,6 +27,7 @@
 #include <linux/slab.h>
 #include <linux/proc_fs.h>
 #include <linux/efi.h>
+#include <linux/memory_hotplug.h>
 
 #include <asm/processor.h>
 #include <asm/system.h>
@@ -266,17 +267,46 @@ static void __init permanent_kmaps_init(pgd_t *pgd_base)
         pkmap_page_table = pte; 
 }
 
-void __init one_highpage_init(struct page *page, int pfn, int bad_ppro)
+void __devinit free_new_highpage(struct page *page)
+{
+        set_page_count(page, 1);
+        __free_page(page);
+        totalhigh_pages++;
+}
+
+void __init add_one_highpage_init(struct page *page, int pfn, int bad_ppro)
 {
         if (page_is_ram(pfn) && !(bad_ppro && page_kills_ppro(pfn))) {
                 ClearPageReserved(page);
-                set_page_count(page, 1);
-                __free_page(page);
-                totalhigh_pages++;
+                free_new_highpage(page);
         } else
                 SetPageReserved(page);
 }
 
+static int add_one_highpage_hotplug(struct page *page, unsigned long pfn)
+{
+        free_new_highpage(page);
+        totalram_pages++;
+#ifdef CONFIG_FLATMEM
+        max_mapnr = max(pfn, max_mapnr);
+#endif
+        num_physpages++;
+        return 0;
+}
+
+/*
+ * Not currently handling the NUMA case.
+ * Assuming single node and all memory that
+ * has been added dynamically that would be
+ * onlined here is in HIGHMEM
+ */
+void online_page(struct page *page)
+{
+        ClearPageReserved(page);
+        add_one_highpage_hotplug(page, page_to_pfn(page));
+}
+
+
 #ifdef CONFIG_NUMA
 extern void set_highmem_pages_init(int);
 #else
@@ -284,7 +314,7 @@ static void __init set_highmem_pages_init(int bad_ppro)
 {
         int pfn;
         for (pfn = highstart_pfn; pfn < highend_pfn; pfn++)
-                one_highpage_init(pfn_to_page(pfn), pfn, bad_ppro);
+                add_one_highpage_init(pfn_to_page(pfn), pfn, bad_ppro);
         totalram_pages += totalhigh_pages;
 }
 #endif /* CONFIG_FLATMEM */
@@ -615,6 +645,28 @@ void __init mem_init(void)
 #endif
 }
 
+/*
+ * this is for the non-NUMA, single node SMP system case.
+ * Specifically, in the case of x86, we will always add
+ * memory to the highmem for now.
+ */
+#ifndef CONFIG_NEED_MULTIPLE_NODES
+int add_memory(u64 start, u64 size)
+{
+        struct pglist_data *pgdata = &contig_page_data;
+        struct zone *zone = pgdata->node_zones + MAX_NR_ZONES-1;
+        unsigned long start_pfn = start >> PAGE_SHIFT;
+        unsigned long nr_pages = size >> PAGE_SHIFT;
+
+        return __add_pages(zone, start_pfn, nr_pages);
+}
+
+int remove_memory(u64 start, u64 size)
+{
+        return -EINVAL;
+}
+#endif
+
 kmem_cache_t *pgd_cache;
 kmem_cache_t *pmd_cache;
 
diff --git a/arch/i386/mm/ioremap.c b/arch/i386/mm/ioremap.c
index f379b8d67558..5d09de8d1c6b 100644
--- a/arch/i386/mm/ioremap.c
+++ b/arch/i386/mm/ioremap.c
@@ -28,7 +28,7 @@ static int ioremap_pte_range(pmd_t *pmd, unsigned long addr,
         unsigned long pfn;
 
         pfn = phys_addr >> PAGE_SHIFT;
-        pte = pte_alloc_kernel(&init_mm, pmd, addr);
+        pte = pte_alloc_kernel(pmd, addr);
         if (!pte)
                 return -ENOMEM;
         do {
@@ -87,14 +87,12 @@ static int ioremap_page_range(unsigned long addr,
         flush_cache_all();
         phys_addr -= addr;
         pgd = pgd_offset_k(addr);
-        spin_lock(&init_mm.page_table_lock);
         do {
                 next = pgd_addr_end(addr, end);
                 err = ioremap_pud_range(pgd, addr, next, phys_addr+addr, flags);
                 if (err)
                         break;
         } while (pgd++, addr = next, addr != end);
-        spin_unlock(&init_mm.page_table_lock);
         flush_tlb_all();
         return err;
 }
diff --git a/arch/i386/mm/pgtable.c b/arch/i386/mm/pgtable.c
index dcdce2c6c532..9db3242103be 100644
--- a/arch/i386/mm/pgtable.c
+++ b/arch/i386/mm/pgtable.c
@@ -31,11 +31,13 @@ void show_mem(void)
         pg_data_t *pgdat;
         unsigned long i;
         struct page_state ps;
+        unsigned long flags;
 
         printk(KERN_INFO "Mem-info:\n");
         show_free_areas();
         printk(KERN_INFO "Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
         for_each_pgdat(pgdat) {
+                pgdat_resize_lock(pgdat, &flags);
                 for (i = 0; i < pgdat->node_spanned_pages; ++i) {
                         page = pgdat_page_nr(pgdat, i);
                         total++;
@@ -48,6 +50,7 @@ void show_mem(void)
                         else if (page_count(page))
                                 shared += page_count(page) - 1;
                 }
+                pgdat_resize_unlock(pgdat, &flags);
         }
         printk(KERN_INFO "%d pages of RAM\n", total);
         printk(KERN_INFO "%d pages of HIGHMEM\n", highmem);
@@ -188,19 +191,19 @@ static inline void pgd_list_add(pgd_t *pgd)
         struct page *page = virt_to_page(pgd);
         page->index = (unsigned long)pgd_list;
         if (pgd_list)
-                pgd_list->private = (unsigned long)&page->index;
+                set_page_private(pgd_list, (unsigned long)&page->index);
         pgd_list = page;
-        page->private = (unsigned long)&pgd_list;
+        set_page_private(page, (unsigned long)&pgd_list);
 }
 
 static inline void pgd_list_del(pgd_t *pgd)
 {
         struct page *next, **pprev, *page = virt_to_page(pgd);
         next = (struct page *)page->index;
-        pprev = (struct page **)page->private;
+        pprev = (struct page **)page_private(page);
         *pprev = next;
         if (next)
-                next->private = (unsigned long)pprev;
+                set_page_private(next, (unsigned long)pprev);
 }
 
 void pgd_ctor(void *pgd, kmem_cache_t *cache, unsigned long unused)
diff --git a/arch/i386/oprofile/backtrace.c b/arch/i386/oprofile/backtrace.c
index 65dfd2edb671..21654be3f73f 100644
--- a/arch/i386/oprofile/backtrace.c
+++ b/arch/i386/oprofile/backtrace.c
@@ -12,6 +12,7 @@
 #include <linux/sched.h>
 #include <linux/mm.h>
 #include <asm/ptrace.h>
+#include <asm/uaccess.h>
 
 struct frame_head {
         struct frame_head * ebp;
@@ -21,26 +22,22 @@ struct frame_head {
 static struct frame_head *
 dump_backtrace(struct frame_head * head)
 {
-        oprofile_add_trace(head->ret);
+        struct frame_head bufhead[2];
 
-        /* frame pointers should strictly progress back up the stack
-         * (towards higher addresses) */
-        if (head >= head->ebp)
+        /* Also check accessibility of one struct frame_head beyond */
+        if (!access_ok(VERIFY_READ, head, sizeof(bufhead)))
+                return NULL;
+        if (__copy_from_user_inatomic(bufhead, head, sizeof(bufhead)))
                 return NULL;
 
-        return head->ebp;
-}
-
-/* check that the page(s) containing the frame head are present */
-static int pages_present(struct frame_head * head)
-{
-        struct mm_struct * mm = current->mm;
+        oprofile_add_trace(bufhead[0].ret);
 
-        /* FIXME: only necessary once per page */
-        if (!check_user_page_readable(mm, (unsigned long)head))
-                return 0;
+        /* frame pointers should strictly progress back up the stack
+         * (towards higher addresses) */
+        if (head >= bufhead[0].ebp)
+                return NULL;
 
-        return check_user_page_readable(mm, (unsigned long)(head + 1));
+        return bufhead[0].ebp;
 }
 
 /*
@@ -97,15 +94,6 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
                 return;
         }
 
-#ifdef CONFIG_SMP
-        if (!spin_trylock(&current->mm->page_table_lock))
-                return;
-#endif
-
-        while (depth-- && head && pages_present(head))
+        while (depth-- && head)
                 head = dump_backtrace(head);
-
-#ifdef CONFIG_SMP
-        spin_unlock(&current->mm->page_table_lock);
-#endif
 }
diff --git a/arch/i386/pci/fixup.c b/arch/i386/pci/fixup.c
index 8e8e895e1b5a..330fd2b68075 100644
--- a/arch/i386/pci/fixup.c
+++ b/arch/i386/pci/fixup.c
@@ -2,6 +2,8 @@
  * Exceptions for specific devices. Usually work-arounds for fatal design flaws.
  */
 
+#include <linux/delay.h>
+#include <linux/dmi.h>
 #include <linux/pci.h>
 #include <linux/init.h>
 #include "pci.h"
@@ -384,3 +386,60 @@ static void __devinit pci_fixup_video(struct pci_dev *pdev)
         }
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_video);
+
+/*
+ * Some Toshiba laptops need extra code to enable their TI TSB43AB22/A.
+ *
+ * We pretend to bring them out of full D3 state, and restore the proper
+ * IRQ, PCI cache line size, and BARs, otherwise the device won't function
+ * properly.  In some cases, the device will generate an interrupt on
+ * the wrong IRQ line, causing any devices sharing the the line it's
+ * *supposed* to use to be disabled by the kernel's IRQ debug code.
+ */
+static u16 toshiba_line_size;
+
+static struct dmi_system_id __devinit toshiba_ohci1394_dmi_table[] = {
+        {
+                .ident = "Toshiba PS5 based laptop",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                        DMI_MATCH(DMI_PRODUCT_VERSION, "PS5"),
+                },
+        },
+        {
+                .ident = "Toshiba PSM4 based laptop",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                        DMI_MATCH(DMI_PRODUCT_VERSION, "PSM4"),
+                },
+        },
+        { }
+};
+
+static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev)
+{
+        if (!dmi_check_system(toshiba_ohci1394_dmi_table))
+                return; /* only applies to certain Toshibas (so far) */
+
+        dev->current_state = PCI_D3cold;
+        pci_read_config_word(dev, PCI_CACHE_LINE_SIZE, &toshiba_line_size);
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TI, 0x8032,
+                         pci_pre_fixup_toshiba_ohci1394);
+
+static void __devinit pci_post_fixup_toshiba_ohci1394(struct pci_dev *dev)
+{
+        if (!dmi_check_system(toshiba_ohci1394_dmi_table))
+                return; /* only applies to certain Toshibas (so far) */
+
+        /* Restore config space on Toshiba laptops */
+        mdelay(10);
+        pci_write_config_word(dev, PCI_CACHE_LINE_SIZE, toshiba_line_size);
+        pci_write_config_word(dev, PCI_INTERRUPT_LINE, dev->irq);
+        pci_write_config_dword(dev, PCI_BASE_ADDRESS_0,
+                               pci_resource_start(dev, 0));
+        pci_write_config_dword(dev, PCI_BASE_ADDRESS_1,
+                               pci_resource_start(dev, 1));
+}
+DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_TI, 0x8032,
+                         pci_post_fixup_toshiba_ohci1394);