Merge branch 'master' into upstream

11 files changed, 59 insertions, 41 deletions

diff --git a/arch/i386/defconfig b/arch/i386/defconfig
index 1a29bfa26d..ee2d79bd8a 100644
--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18-git5
-# Tue Sep 26 09:30:47 2006
+# Linux kernel version: 2.6.18-git7
+# Wed Sep 27 21:53:10 2006
 #
 CONFIG_X86_32=y
 CONFIG_GENERIC_TIME=y
@@ -210,6 +210,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_PM=y
 CONFIG_PM_LEGACY=y
 # CONFIG_PM_DEBUG is not set
+CONFIG_PM_SYSFS_DEPRECATED=y
 
 #
 # ACPI (Advanced Configuration and Power Interface) Support
@@ -292,6 +293,7 @@ CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_PCI_MSI=y
+# CONFIG_PCI_MULTITHREAD_PROBE is not set
 # CONFIG_PCI_DEBUG is not set
 CONFIG_ISA_DMA_API=y
 # CONFIG_ISA is not set
@@ -1427,6 +1429,7 @@ CONFIG_KPROBES=y
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # CONFIG_PRINTK_TIME is not set
+# CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_UNUSED_SYMBOLS=y
 CONFIG_DEBUG_KERNEL=y
diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c
index ff9ce4b5ea..b42f2d914a 100644
--- a/arch/i386/kernel/apm.c
+++ b/arch/i386/kernel/apm.c
@@ -225,6 +225,7 @@
 #include <linux/smp_lock.h>
 #include <linux/dmi.h>
 #include <linux/suspend.h>
+#include <linux/kthread.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
@@ -402,8 +403,6 @@ static int			realmode_power_off = 1;
 #else
 static int                      realmode_power_off;
 #endif
-static int                      exit_kapmd __read_mostly;
-static int                      kapmd_running __read_mostly;
 #ifdef CONFIG_APM_ALLOW_INTS
 static int                      allow_ints = 1;
 #else
@@ -419,6 +418,8 @@ static const struct desc_struct	bad_bios_desc = { 0, 0x00409200 };
 
 static const char               driver_version[] = "1.16ac";    /* no spaces */
 
+static struct task_struct *kapmd_task;
+
 /*
  *      APM event names taken from the APM 1.2 specification. These are
  *      the message codes that the BIOS uses to tell us about events
@@ -1423,7 +1424,7 @@ static void apm_mainloop(void)
         set_current_state(TASK_INTERRUPTIBLE);
         for (;;) {
                 schedule_timeout(APM_CHECK_TIMEOUT);
-                if (exit_kapmd)
+                if (kthread_should_stop())
                         break;
                 /*
                  * Ok, check all events, check for idle (and mark us sleeping
@@ -1706,12 +1707,6 @@ static int apm(void *unused)
         char *          power_stat;
         char *          bat_stat;
 
-        kapmd_running = 1;
-
-        daemonize("kapmd");
-
-        current->flags |= PF_NOFREEZE;
-
 #ifdef CONFIG_SMP
         /* 2002/08/01 - WT
          * This is to avoid random crashes at boot time during initialization
@@ -1821,7 +1816,6 @@ static int apm(void *unused)
                 console_blank_hook = NULL;
 #endif
         }
-        kapmd_running = 0;
 
         return 0;
 }
@@ -2220,7 +2214,7 @@ static int __init apm_init(void)
 {
         struct proc_dir_entry *apm_proc;
         struct desc_struct *gdt;
-        int ret;
+        int err;
 
         dmi_check_system(apm_dmi_table);
 
@@ -2329,12 +2323,17 @@ static int __init apm_init(void)
         if (apm_proc)
                 apm_proc->owner = THIS_MODULE;
 
-        ret = kernel_thread(apm, NULL, CLONE_KERNEL | SIGCHLD);
-        if (ret < 0) {
-                printk(KERN_ERR "apm: disabled - Unable to start kernel thread.\n");
+        kapmd_task = kthread_create(apm, NULL, "kapmd");
+        if (IS_ERR(kapmd_task)) {
+                printk(KERN_ERR "apm: disabled - Unable to start kernel "
+                                "thread.\n");
+                err = PTR_ERR(kapmd_task);
+                kapmd_task = NULL;
                 remove_proc_entry("apm", NULL);
-                return -ENOMEM;
+                return err;
         }
+        kapmd_task->flags |= PF_NOFREEZE;
+        wake_up_process(kapmd_task);
 
         if (num_online_cpus() > 1 && !smp ) {
                 printk(KERN_NOTICE
@@ -2384,9 +2383,10 @@ static void __exit apm_exit(void)
         remove_proc_entry("apm", NULL);
         if (power_off)
                 pm_power_off = NULL;
-        exit_kapmd = 1;
-        while (kapmd_running)
-                schedule();
+        if (kapmd_task) {
+                kthread_stop(kapmd_task);
+                kapmd_task = NULL;
+        }
 #ifdef CONFIG_PM_LEGACY
         pm_active = 0;
 #endif
diff --git a/arch/i386/kernel/efi.c b/arch/i386/kernel/efi.c
index fe15804211..f943698947 100644
--- a/arch/i386/kernel/efi.c
+++ b/arch/i386/kernel/efi.c
@@ -65,7 +65,7 @@ static unsigned long efi_rt_eflags;
 static DEFINE_SPINLOCK(efi_rt_lock);
 static pgd_t efi_bak_pg_dir_pointer[2];
 
-static void efi_call_phys_prelog(void)
+static void efi_call_phys_prelog(void) __acquires(efi_rt_lock)
 {
         unsigned long cr4;
         unsigned long temp;
@@ -109,7 +109,7 @@ static void efi_call_phys_prelog(void)
         load_gdt(cpu_gdt_descr);
 }
 
-static void efi_call_phys_epilog(void)
+static void efi_call_phys_epilog(void) __releases(efi_rt_lock)
 {
         unsigned long cr4;
         struct Xgt_desc_struct *cpu_gdt_descr = &per_cpu(cpu_gdt_descr, 0);
diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c
index dbda706fdd..0fc4997fb1 100644
--- a/arch/i386/kernel/nmi.c
+++ b/arch/i386/kernel/nmi.c
@@ -31,6 +31,9 @@
 
 #include "mach_traps.h"
 
+int unknown_nmi_panic;
+int nmi_watchdog_enabled;
+
 /* perfctr_nmi_owner tracks the ownership of the perfctr registers:
  * evtsel_nmi_owner tracks the ownership of the event selection
  * - different performance counters/ event selection may be reserved for
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index 814cdebf73..000cf03751 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -209,9 +209,6 @@ static struct resource adapter_rom_resources[] = { {
         .flags  = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
 } };
 
-#define ADAPTER_ROM_RESOURCES \
-        (sizeof adapter_rom_resources / sizeof adapter_rom_resources[0])
-
 static struct resource video_rom_resource = {
         .name   = "Video ROM",
         .start  = 0xc0000,
@@ -273,9 +270,6 @@ static struct resource standard_io_resources[] = { {
         .flags  = IORESOURCE_BUSY | IORESOURCE_IO
 } };
 
-#define STANDARD_IO_RESOURCES \
-        (sizeof standard_io_resources / sizeof standard_io_resources[0])
-
 #define romsignature(x) (*(unsigned short *)(x) == 0xaa55)
 
 static int __init romchecksum(unsigned char *rom, unsigned long length)
@@ -332,7 +326,7 @@ static void __init probe_roms(void)
         }
 
         /* check for adapter roms on 2k boundaries */
-        for (i = 0; i < ADAPTER_ROM_RESOURCES && start < upper; start += 2048) {
+        for (i = 0; i < ARRAY_SIZE(adapter_rom_resources) && start < upper; start += 2048) {
                 rom = isa_bus_to_virt(start);
                 if (!romsignature(rom))
                         continue;
@@ -1272,7 +1266,7 @@ static int __init request_standard_resources(void)
         request_resource(&iomem_resource, &video_ram_resource);
 
         /* request I/O space for devices used on all i[345]86 PCs */
-        for (i = 0; i < STANDARD_IO_RESOURCES; i++)
+        for (i = 0; i < ARRAY_SIZE(standard_io_resources); i++)
                 request_resource(&ioport_resource, &standard_io_resources[i]);
         return 0;
 }
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c
index 020d873b7d..82b26d5ce4 100644
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
@@ -102,6 +102,8 @@ u8 x86_cpu_to_apicid[NR_CPUS] __read_mostly =
                         { [0 ... NR_CPUS-1] = 0xff };
 EXPORT_SYMBOL(x86_cpu_to_apicid);
 
+u8 apicid_2_node[MAX_APICID];
+
 /*
  * Trampoline 80x86 program as an array.
  */
@@ -645,7 +647,7 @@ static void map_cpu_to_logical_apicid(void)
 {
         int cpu = smp_processor_id();
         int apicid = logical_smp_processor_id();
-        int node = apicid_to_node(apicid);
+        int node = apicid_to_node(hard_smp_processor_id());
 
         if (!node_online(node))
                 node = first_online_node;
@@ -954,6 +956,7 @@ static int __devinit do_boot_cpu(int apicid, int cpu)
 
         irq_ctx_init(cpu);
 
+        x86_cpu_to_apicid[cpu] = apicid;
         /*
          * This grunge runs the startup process for
          * the targeted processor.
diff --git a/arch/i386/kernel/srat.c b/arch/i386/kernel/srat.c
index 32413122c4..f7e735c077 100644
--- a/arch/i386/kernel/srat.c
+++ b/arch/i386/kernel/srat.c
@@ -30,6 +30,7 @@
 #include <linux/nodemask.h>
 #include <asm/srat.h>
 #include <asm/topology.h>
+#include <asm/smp.h>
 
 /*
  * proximity macros and definitions
@@ -54,6 +55,7 @@ struct node_memory_chunk_s {
 static struct node_memory_chunk_s node_memory_chunk[MAXCHUNKS];
 
 static int num_memory_chunks;           /* total number of memory chunks */
+static u8 __initdata apicid_to_pxm[MAX_APICID];
 
 extern void * boot_ioremap(unsigned long, unsigned long);
 
@@ -69,6 +71,8 @@ static void __init parse_cpu_affinity_structure(char *p)
         /* mark this node as "seen" in node bitmap */
         BMAP_SET(pxm_bitmap, cpu_affinity->proximity_domain);
 
+        apicid_to_pxm[cpu_affinity->apic_id] = cpu_affinity->proximity_domain;
+
         printk("CPU 0x%02X in proximity domain 0x%02X\n",
                 cpu_affinity->apic_id, cpu_affinity->proximity_domain);
 }
@@ -235,6 +239,9 @@ static int __init acpi20_parse_srat(struct acpi_table_srat *sratp)
         printk("Number of logical nodes in system = %d\n", num_online_nodes());
         printk("Number of memory chunks in system = %d\n", num_memory_chunks);
 
+        for (i = 0; i < MAX_APICID; i++)
+                apicid_2_node[i] = pxm_to_node(apicid_to_pxm[i]);
+
         for (j = 0; j < num_memory_chunks; j++){
                 struct node_memory_chunk_s * chunk = &node_memory_chunk[j];
                 printk("chunk %d nid %d start_pfn %08lx end_pfn %08lx\n",
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index a13037fe0e..6820b8d643 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -57,6 +57,8 @@
 
 #include "mach_traps.h"
 
+int panic_on_unrecovered_nmi;
+
 asmlinkage int system_call(void);
 
 struct desc_struct default_ldt[] = { { 0, 0 }, { 0, 0 }, { 0, 0 },
diff --git a/arch/i386/lib/usercopy.c b/arch/i386/lib/usercopy.c
index efc7e7d5f4..08502fc6d0 100644
--- a/arch/i386/lib/usercopy.c
+++ b/arch/i386/lib/usercopy.c
@@ -739,7 +739,7 @@ survive:
                         retval = get_user_pages(current, current->mm,
                                         (unsigned long )to, 1, 1, 0, &pg, NULL);
 
-                        if (retval == -ENOMEM && current->pid == 1) {
+                        if (retval == -ENOMEM && is_init(current)) {
                                 up_read(&current->mm->mmap_sem);
                                 blk_congestion_wait(WRITE, HZ/50);
                                 goto survive;
diff --git a/arch/i386/mm/fault.c b/arch/i386/mm/fault.c
index 5e17a3f43b..2581575786 100644
--- a/arch/i386/mm/fault.c
+++ b/arch/i386/mm/fault.c
@@ -440,7 +440,7 @@ good_area:
                 case 1:         /* read, present */
                         goto bad_area;
                 case 0:         /* read, not present */
-                        if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
+                        if (!(vma->vm_flags & (VM_READ | VM_EXEC | VM_WRITE)))
                                 goto bad_area;
         }
 
@@ -589,7 +589,7 @@ no_context:
  */
 out_of_memory:
         up_read(&mm->mmap_sem);
-        if (tsk->pid == 1) {
+        if (is_init(tsk)) {
                 yield();
                 down_read(&mm->mmap_sem);
                 goto survive;
diff --git a/arch/i386/oprofile/op_model_ppro.c b/arch/i386/oprofile/op_model_ppro.c
index f88e05ba8e..ca2447e05e 100644
--- a/arch/i386/oprofile/op_model_ppro.c
+++ b/arch/i386/oprofile/op_model_ppro.c
@@ -138,11 +138,14 @@ static int ppro_check_ctrs(struct pt_regs * const regs,
 static void ppro_start(struct op_msrs const * const msrs)
 {
         unsigned int low,high;
+        int i;
 
-        if (reset_value[0]) {
-                CTRL_READ(low, high, msrs, 0);
-                CTRL_SET_ACTIVE(low);
-                CTRL_WRITE(low, high, msrs, 0);
+        for (i = 0; i < NUM_COUNTERS; ++i) {
+                if (reset_value[i]) {
+                        CTRL_READ(low, high, msrs, i);
+                        CTRL_SET_ACTIVE(low);
+                        CTRL_WRITE(low, high, msrs, i);
+                }
         }
 }
 
@@ -150,11 +153,14 @@ static void ppro_start(struct op_msrs const * const msrs)
 static void ppro_stop(struct op_msrs const * const msrs)
 {
         unsigned int low,high;
+        int i;
 
-        if (reset_value[0]) {
-                CTRL_READ(low, high, msrs, 0);
+        for (i = 0; i < NUM_COUNTERS; ++i) {
+                if (!reset_value[i])
+                        continue;
+                CTRL_READ(low, high, msrs, i);
                 CTRL_SET_INACTIVE(low);
-                CTRL_WRITE(low, high, msrs, 0);
+                CTRL_WRITE(low, high, msrs, i);
         }
 }