9 files changed, 54 insertions, 27 deletions

diff --git a/CREDITS b/CREDITS
index 606d407cfc15..ccd4f9f4dd71 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3511,14 +3511,12 @@ D: The Linux Support Team Erlangen
 
 N: David Weinehall
 E: tao@acc.umu.se
+P: 1024D/DC47CA16 7ACE 0FB0 7A74 F994 9B36  E1D1 D14E 8526 DC47 CA16
 W: http://www.acc.umu.se/~tao/
-W: http://www.acc.umu.se/~mcalinux/
+D: v2.0 kernel maintainer
 D: Fixes for the NE/2-driver
 D: Miscellaneous MCA-support
 D: Cleanup of the Config-files
-S: Axtorpsvagen 40:20
-S: S-903 37  UMEA
-S: Sweden
 
 N: Matt Welsh
 E: mdw@metalab.unc.edu
diff --git a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c
index 1e1fa3e391a3..dd53c58f64f1 100644
--- a/arch/i386/kernel/process.c
+++ b/arch/i386/kernel/process.c
@@ -205,7 +205,7 @@ void cpu_idle(void)
 void cpu_idle_wait(void)
 {
         unsigned int cpu, this_cpu = get_cpu();
-        cpumask_t map;
+        cpumask_t map, tmp = current->cpus_allowed;
 
         set_cpus_allowed(current, cpumask_of_cpu(this_cpu));
         put_cpu();
@@ -227,6 +227,8 @@ void cpu_idle_wait(void)
                 }
                 cpus_and(map, map, cpu_online_map);
         } while (!cpus_empty(map));
+
+        set_cpus_allowed(current, tmp);
 }
 EXPORT_SYMBOL_GPL(cpu_idle_wait);
 
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index 00489b706d27..fe9c5e8e7e6f 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -129,15 +129,19 @@ static inline unsigned long print_context_stack(struct thread_info *tinfo,
 
 #ifdef  CONFIG_FRAME_POINTER
         while (valid_stack_ptr(tinfo, (void *)ebp)) {
+                unsigned long new_ebp;
                 addr = *(unsigned long *)(ebp + 4);
                 ops->address(data, addr);
                 /*
                  * break out of recursive entries (such as
-                 * end_of_stack_stop_unwind_function):
+                 * end_of_stack_stop_unwind_function). Also,
+                 * we can never allow a frame pointer to
+                 * move downwards!
                  */
-                if (ebp == *(unsigned long *)ebp)
+                new_ebp = *(unsigned long *)ebp;
+                if (new_ebp <= ebp)
                         break;
-                ebp = *(unsigned long *)ebp;
+                ebp = new_ebp;
         }
 #else
         while (valid_stack_ptr(tinfo, stack)) {
diff --git a/arch/x86_64/kernel/process.c b/arch/x86_64/kernel/process.c
index f6226055d53d..7451a4c43c16 100644
--- a/arch/x86_64/kernel/process.c
+++ b/arch/x86_64/kernel/process.c
@@ -144,7 +144,7 @@ static void poll_idle (void)
 void cpu_idle_wait(void)
 {
         unsigned int cpu, this_cpu = get_cpu();
-        cpumask_t map;
+        cpumask_t map, tmp = current->cpus_allowed;
 
         set_cpus_allowed(current, cpumask_of_cpu(this_cpu));
         put_cpu();
@@ -167,6 +167,8 @@ void cpu_idle_wait(void)
                 }
                 cpus_and(map, map, cpu_online_map);
         } while (!cpus_empty(map));
+
+        set_cpus_allowed(current, tmp);
 }
 EXPORT_SYMBOL_GPL(cpu_idle_wait);
 
diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c
index 7819022a8db5..a153d0a01b72 100644
--- a/arch/x86_64/kernel/traps.c
+++ b/arch/x86_64/kernel/traps.c
@@ -290,6 +290,12 @@ void dump_trace(struct task_struct *tsk, struct pt_regs *regs, unsigned long * s
                 if (tsk && tsk != current)
                         stack = (unsigned long *)tsk->thread.rsp;
         }
+        /*
+         * Align the stack pointer on word boundary, later loops
+         * rely on that (and corruption / debug info bugs can cause
+         * unaligned values here):
+         */
+        stack = (unsigned long *)((unsigned long)stack & ~(sizeof(long)-1));
 
         /*
          * Print function call entries within a stack. 'cond' is the
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index c84286cbbe25..068fe4f100b0 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -73,7 +73,6 @@ static unsigned int acpi_irq_irq;
 static acpi_osd_handler acpi_irq_handler;
 static void *acpi_irq_context;
 static struct workqueue_struct *kacpid_wq;
-static struct workqueue_struct *kacpi_notify_wq;
 
 acpi_status acpi_os_initialize(void)
 {
@@ -92,9 +91,8 @@ acpi_status acpi_os_initialize1(void)
                 return AE_NULL_ENTRY;
         }
         kacpid_wq = create_singlethread_workqueue("kacpid");
-        kacpi_notify_wq = create_singlethread_workqueue("kacpi_notify");
         BUG_ON(!kacpid_wq);
-        BUG_ON(!kacpi_notify_wq);
+
         return AE_OK;
 }
 
@@ -106,7 +104,6 @@ acpi_status acpi_os_terminate(void)
         }
 
         destroy_workqueue(kacpid_wq);
-        destroy_workqueue(kacpi_notify_wq);
 
         return AE_OK;
 }
@@ -569,7 +566,10 @@ void acpi_os_derive_pci_id(acpi_handle rhandle,	/* upper bound  */
 
 static void acpi_os_execute_deferred(void *context)
 {
-        struct acpi_os_dpc *dpc = (struct acpi_os_dpc *)context;
+        struct acpi_os_dpc *dpc = NULL;
+
+
+        dpc = (struct acpi_os_dpc *)context;
         if (!dpc) {
                 printk(KERN_ERR PREFIX "Invalid (NULL) context\n");
                 return;
@@ -604,12 +604,14 @@ acpi_status acpi_os_execute(acpi_execute_type type,
         struct acpi_os_dpc *dpc;
         struct work_struct *task;
 
+        ACPI_FUNCTION_TRACE("os_queue_for_execution");
+
         ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
                           "Scheduling function [%p(%p)] for deferred execution.\n",
                           function, context));
 
         if (!function)
-                return AE_BAD_PARAMETER;
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
 
         /*
          * Allocate/initialize DPC structure.  Note that this memory will be
@@ -622,20 +624,26 @@ acpi_status acpi_os_execute(acpi_execute_type type,
          * from the same memory.
          */
 
-        dpc = kmalloc(sizeof(struct acpi_os_dpc) +
-                        sizeof(struct work_struct), GFP_ATOMIC);
+        dpc =
+            kmalloc(sizeof(struct acpi_os_dpc) + sizeof(struct work_struct),
+                    GFP_ATOMIC);
         if (!dpc)
-                return AE_NO_MEMORY;
+                return_ACPI_STATUS(AE_NO_MEMORY);
+
         dpc->function = function;
         dpc->context = context;
+
         task = (void *)(dpc + 1);
         INIT_WORK(task, acpi_os_execute_deferred, (void *)dpc);
-        if (!queue_work((type == OSL_NOTIFY_HANDLER)?
-                        kacpi_notify_wq : kacpid_wq, task)) {
-                status = AE_ERROR;
+
+        if (!queue_work(kacpid_wq, task)) {
+                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                                  "Call to queue_work() failed.\n"));
                 kfree(dpc);
+                status = AE_ERROR;
         }
-        return status;
+
+        return_ACPI_STATUS(status);
 }
 
 EXPORT_SYMBOL(acpi_os_execute);
diff --git a/drivers/video/aty/radeon_i2c.c b/drivers/video/aty/radeon_i2c.c
index 676754520099..869725a13c21 100644
--- a/drivers/video/aty/radeon_i2c.c
+++ b/drivers/video/aty/radeon_i2c.c
@@ -139,7 +139,13 @@ void radeon_delete_i2c_busses(struct radeonfb_info *rinfo)
 int radeon_probe_i2c_connector(struct radeonfb_info *rinfo, int conn,
                                u8 **out_edid)
 {
-        u8 *edid = fb_ddc_read(&rinfo->i2c[conn-1].adapter);
+        u32 reg = rinfo->i2c[conn-1].ddc_reg;
+        u8 *edid;
+
+        OUTREG(reg, INREG(reg) &
+                        ~(VGA_DDC_DATA_OUTPUT | VGA_DDC_CLK_OUTPUT));
+
+        edid = fb_ddc_read(&rinfo->i2c[conn-1].adapter);
 
         if (out_edid)
                 *out_edid = edid;
diff --git a/drivers/video/fb_ddc.c b/drivers/video/fb_ddc.c
index 3aa6ebf68f17..f836137a0eda 100644
--- a/drivers/video/fb_ddc.c
+++ b/drivers/video/fb_ddc.c
@@ -20,26 +20,26 @@
 static unsigned char *fb_do_probe_ddc_edid(struct i2c_adapter *adapter)
 {
         unsigned char start = 0x0;
+        unsigned char *buf = kmalloc(EDID_LENGTH, GFP_KERNEL);
         struct i2c_msg msgs[] = {
                 {
                         .addr   = DDC_ADDR,
+                        .flags  = 0,
                         .len    = 1,
                         .buf    = &start,
                 }, {
                         .addr   = DDC_ADDR,
                         .flags  = I2C_M_RD,
                         .len    = EDID_LENGTH,
+                        .buf    = buf,
                 }
         };
-        unsigned char *buf;
 
-        buf = kmalloc(EDID_LENGTH, GFP_KERNEL);
         if (!buf) {
                 dev_warn(&adapter->dev, "unable to allocate memory for EDID "
                          "block.\n");
                 return NULL;
         }
-        msgs[1].buf = buf;
 
         if (i2c_transfer(adapter, msgs, 2) == 2)
                 return buf;
diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index b739be2a6dc9..c9fefdb1a7db 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -1081,7 +1081,8 @@ static int static_obj(void *obj)
          */
         for_each_possible_cpu(i) {
                 start = (unsigned long) &__per_cpu_start + per_cpu_offset(i);
-                end   = (unsigned long) &__per_cpu_end   + per_cpu_offset(i);
+                end   = (unsigned long) &__per_cpu_start + PERCPU_ENOUGH_ROOM
+                                        + per_cpu_offset(i);
 
                 if ((addr >= start) && (addr < end))
                         return 1;