Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

3 files changed, 13 insertions, 4 deletions

diff --git a/arch/ia64/kernel/pci-swiotlb.c b/arch/ia64/kernel/pci-swiotlb.c
index 3095654f9ab3..d9485d952ed0 100644
--- a/arch/ia64/kernel/pci-swiotlb.c
+++ b/arch/ia64/kernel/pci-swiotlb.c
@@ -31,8 +31,6 @@ struct dma_map_ops swiotlb_dma_ops = {
         .unmap_sg = swiotlb_unmap_sg_attrs,
         .sync_single_for_cpu = swiotlb_sync_single_for_cpu,
         .sync_single_for_device = swiotlb_sync_single_for_device,
-        .sync_single_range_for_cpu = swiotlb_sync_single_range_for_cpu,
-        .sync_single_range_for_device = swiotlb_sync_single_range_for_device,
         .sync_sg_for_cpu = swiotlb_sync_sg_for_cpu,
         .sync_sg_for_device = swiotlb_sync_sg_for_device,
         .dma_supported = swiotlb_dma_supported,
diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c
index 0dec7f702448..7c7909f9bc93 100644
--- a/arch/ia64/kernel/ptrace.c
+++ b/arch/ia64/kernel/ptrace.c
@@ -638,7 +638,7 @@ ptrace_attach_sync_user_rbs (struct task_struct *child)
          */
 
         read_lock(&tasklist_lock);
-        if (child->signal) {
+        if (child->sighand) {
                 spin_lock_irq(&child->sighand->siglock);
                 if (child->state == TASK_STOPPED &&
                     !test_and_set_tsk_thread_flag(child, TIF_RESTORE_RSE)) {
@@ -662,7 +662,7 @@ ptrace_attach_sync_user_rbs (struct task_struct *child)
          * job control stop, so that SIGCONT can be used to wake it up.
          */
         read_lock(&tasklist_lock);
-        if (child->signal) {
+        if (child->sighand) {
                 spin_lock_irq(&child->sighand->siglock);
                 if (child->state == TASK_TRACED &&
                     (child->signal->flags & SIGNAL_STOP_STOPPED)) {
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index e5230b2ff2c5..6a1380e90f87 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -390,6 +390,14 @@ smp_callin (void)
 
         fix_b0_for_bsp();
 
+#ifdef CONFIG_NUMA
+        /*
+         * numa_node_id() works after this.
+         */
+        set_numa_node(cpu_to_node_map[cpuid]);
+        set_numa_mem(local_memory_node(cpu_to_node_map[cpuid]));
+#endif
+
         ipi_call_lock_irq();
         spin_lock(&vector_lock);
         /* Setup the per cpu irq handling data structures */
@@ -632,6 +640,9 @@ void __devinit smp_prepare_boot_cpu(void)
 {
         cpu_set(smp_processor_id(), cpu_online_map);
         cpu_set(smp_processor_id(), cpu_callin_map);
+#ifdef CONFIG_NUMA
+        set_numa_node(cpu_to_node_map[smp_processor_id()]);
+#endif
         per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE;
         paravirt_post_smp_prepare_boot_cpu();
 }