Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

12 files changed, 43 insertions, 34 deletions

diff --git a/arch/ia64/kernel/Makefile.gate b/arch/ia64/kernel/Makefile.gate
index ab9b03a9adcc..ceeffc509764 100644
--- a/arch/ia64/kernel/Makefile.gate
+++ b/arch/ia64/kernel/Makefile.gate
@@ -21,7 +21,7 @@ GATECFLAGS_gate-syms.o = -r
 $(obj)/gate-syms.o: $(obj)/gate.lds $(obj)/gate.o FORCE
         $(call if_changed,gate)
 
-# gate-data.o contains the gate DSO image as data in section .data.gate.
+# gate-data.o contains the gate DSO image as data in section .data..gate.
 # We must build gate.so before we can assemble it.
 # Note: kbuild does not track this dependency due to usage of .incbin
 $(obj)/gate-data.o: $(obj)/gate.so
diff --git a/arch/ia64/kernel/gate-data.S b/arch/ia64/kernel/gate-data.S
index 258c0a3238fb..b3ef1c72e132 100644
--- a/arch/ia64/kernel/gate-data.S
+++ b/arch/ia64/kernel/gate-data.S
@@ -1,3 +1,3 @@
-        .section .data.gate, "aw"
+        .section .data..gate, "aw"
 
         .incbin "arch/ia64/kernel/gate.so"
diff --git a/arch/ia64/kernel/gate.S b/arch/ia64/kernel/gate.S
index cf5e0a105e16..245d3e1ec7e1 100644
--- a/arch/ia64/kernel/gate.S
+++ b/arch/ia64/kernel/gate.S
@@ -21,18 +21,18 @@
  * to targets outside the shared object) and to avoid multi-phase kernel builds, we
  * simply create minimalistic "patch lists" in special ELF sections.
  */
-        .section ".data.patch.fsyscall_table", "a"
+        .section ".data..patch.fsyscall_table", "a"
         .previous
 #define LOAD_FSYSCALL_TABLE(reg)                        \
 [1:]    movl reg=0;                                     \
-        .xdata4 ".data.patch.fsyscall_table", 1b-.
+        .xdata4 ".data..patch.fsyscall_table", 1b-.
 
-        .section ".data.patch.brl_fsys_bubble_down", "a"
+        .section ".data..patch.brl_fsys_bubble_down", "a"
         .previous
 #define BRL_COND_FSYS_BUBBLE_DOWN(pr)                   \
 [1:](pr)brl.cond.sptk 0;                                \
         ;;                                              \
-        .xdata4 ".data.patch.brl_fsys_bubble_down", 1b-.
+        .xdata4 ".data..patch.brl_fsys_bubble_down", 1b-.
 
 GLOBAL_ENTRY(__kernel_syscall_via_break)
         .prologue
diff --git a/arch/ia64/kernel/gate.lds.S b/arch/ia64/kernel/gate.lds.S
index 88c64ed47c36..d32b0855110a 100644
--- a/arch/ia64/kernel/gate.lds.S
+++ b/arch/ia64/kernel/gate.lds.S
@@ -33,21 +33,21 @@ SECTIONS
          */
         . = GATE_ADDR + 0x600;
 
-        .data.patch             : {
+        .data..patch            : {
                 __paravirt_start_gate_mckinley_e9_patchlist = .;
-                *(.data.patch.mckinley_e9)
+                *(.data..patch.mckinley_e9)
                 __paravirt_end_gate_mckinley_e9_patchlist = .;
 
                 __paravirt_start_gate_vtop_patchlist = .;
-                *(.data.patch.vtop)
+                *(.data..patch.vtop)
                 __paravirt_end_gate_vtop_patchlist = .;
 
                 __paravirt_start_gate_fsyscall_patchlist = .;
-                *(.data.patch.fsyscall_table)
+                *(.data..patch.fsyscall_table)
                 __paravirt_end_gate_fsyscall_patchlist = .;
 
                 __paravirt_start_gate_brl_fsys_bubble_down_patchlist = .;
-                *(.data.patch.brl_fsys_bubble_down)
+                *(.data..patch.brl_fsys_bubble_down)
                 __paravirt_end_gate_brl_fsys_bubble_down_patchlist = .;
         }                                               :readable
 
diff --git a/arch/ia64/kernel/init_task.c b/arch/ia64/kernel/init_task.c
index e253ab8fcbc8..f9efe9739d3f 100644
--- a/arch/ia64/kernel/init_task.c
+++ b/arch/ia64/kernel/init_task.c
@@ -23,7 +23,7 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
  * Initial task structure.
  *
  * We need to make sure that this is properly aligned due to the way process stacks are
- * handled. This is done by having a special ".data.init_task" section...
+ * handled. This is done by having a special ".data..init_task" section...
  */
 #define init_thread_info        init_task_mem.s.thread_info
 
diff --git a/arch/ia64/kernel/ivt.S b/arch/ia64/kernel/ivt.S
index 179fd122e837..d93e396bf599 100644
--- a/arch/ia64/kernel/ivt.S
+++ b/arch/ia64/kernel/ivt.S
@@ -82,7 +82,7 @@
         mov r19=n;;                     /* prepare to save predicates */                \
         br.sptk.many dispatch_to_fault_handler
 
-        .section .text.ivt,"ax"
+        .section .text..ivt,"ax"
 
         .align 32768    // align on 32KB boundary
         .global ia64_ivt
diff --git a/arch/ia64/kernel/minstate.h b/arch/ia64/kernel/minstate.h
index 292e214a3b84..d56753a11636 100644
--- a/arch/ia64/kernel/minstate.h
+++ b/arch/ia64/kernel/minstate.h
@@ -16,7 +16,7 @@
 #define ACCOUNT_SYS_ENTER
 #endif
 
-.section ".data.patch.rse", "a"
+.section ".data..patch.rse", "a"
 .previous
 
 /*
@@ -215,7 +215,7 @@
 (pUStk) extr.u r17=r18,3,6;                     \
 (pUStk) sub r16=r18,r22;                        \
 [1:](pKStk)     br.cond.sptk.many 1f;           \
-        .xdata4 ".data.patch.rse",1b-.          \
+        .xdata4 ".data..patch.rse",1b-.         \
         ;;                                      \
         cmp.ge p6,p7 = 33,r17;                  \
         ;;                                      \
diff --git a/arch/ia64/kernel/paravirtentry.S b/arch/ia64/kernel/paravirtentry.S
index 6158560d7f17..92d880c4d3d1 100644
--- a/arch/ia64/kernel/paravirtentry.S
+++ b/arch/ia64/kernel/paravirtentry.S
@@ -28,7 +28,7 @@
 #include "entry.h"
 
 #define DATA8(sym, init_value)                  \
-        .pushsection .data.read_mostly ;        \
+        .pushsection .data..read_mostly ;       \
         .align 8 ;                              \
         .global sym ;                           \
         sym: ;                                  \
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();
 }
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
index 1295ba327f6f..e07218a2577f 100644
--- a/arch/ia64/kernel/vmlinux.lds.S
+++ b/arch/ia64/kernel/vmlinux.lds.S
@@ -8,7 +8,7 @@
 
 #define IVT_TEXT                                                        \
                 VMLINUX_SYMBOL(__start_ivt_text) = .;                   \
-                *(.text.ivt)                                            \
+                *(.text..ivt)                                           \
                 VMLINUX_SYMBOL(__end_ivt_text) = .;
 
 OUTPUT_FORMAT("elf64-ia64-little")
@@ -54,8 +54,8 @@ SECTIONS
   .text2 : AT(ADDR(.text2) - LOAD_OFFSET)
         { *(.text2) }
 #ifdef CONFIG_SMP
-  .text.lock : AT(ADDR(.text.lock) - LOAD_OFFSET)
-        { *(.text.lock) }
+  .text..lock : AT(ADDR(.text..lock) - LOAD_OFFSET)
+        { *(.text..lock) }
 #endif
   _etext = .;
 
@@ -75,10 +75,10 @@ SECTIONS
           __stop___mca_table = .;
         }
 
-  .data.patch.phys_stack_reg : AT(ADDR(.data.patch.phys_stack_reg) - LOAD_OFFSET)
+  .data..patch.phys_stack_reg : AT(ADDR(.data..patch.phys_stack_reg) - LOAD_OFFSET)
         {
           __start___phys_stack_reg_patchlist = .;
-          *(.data.patch.phys_stack_reg)
+          *(.data..patch.phys_stack_reg)
           __end___phys_stack_reg_patchlist = .;
         }
 
@@ -110,24 +110,24 @@ SECTIONS
   INIT_TEXT_SECTION(PAGE_SIZE)
   INIT_DATA_SECTION(16)
 
-  .data.patch.vtop : AT(ADDR(.data.patch.vtop) - LOAD_OFFSET)
+  .data..patch.vtop : AT(ADDR(.data..patch.vtop) - LOAD_OFFSET)
         {
           __start___vtop_patchlist = .;
-          *(.data.patch.vtop)
+          *(.data..patch.vtop)
           __end___vtop_patchlist = .;
         }
 
-  .data.patch.rse : AT(ADDR(.data.patch.rse) - LOAD_OFFSET)
+  .data..patch.rse : AT(ADDR(.data..patch.rse) - LOAD_OFFSET)
         {
           __start___rse_patchlist = .;
-          *(.data.patch.rse)
+          *(.data..patch.rse)
           __end___rse_patchlist = .;
         }
 
-  .data.patch.mckinley_e9 : AT(ADDR(.data.patch.mckinley_e9) - LOAD_OFFSET)
+  .data..patch.mckinley_e9 : AT(ADDR(.data..patch.mckinley_e9) - LOAD_OFFSET)
         {
           __start___mckinley_e9_bundles = .;
-          *(.data.patch.mckinley_e9)
+          *(.data..patch.mckinley_e9)
           __end___mckinley_e9_bundles = .;
         }
 
@@ -175,17 +175,17 @@ SECTIONS
   . = ALIGN(PAGE_SIZE);
   __init_end = .;
 
-  .data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET)
+  .data..page_aligned : AT(ADDR(.data..page_aligned) - LOAD_OFFSET)
         {
         PAGE_ALIGNED_DATA(PAGE_SIZE)
           . = ALIGN(PAGE_SIZE);
           __start_gate_section = .;
-          *(.data.gate)
+          *(.data..gate)
           __stop_gate_section = .;
 #ifdef CONFIG_XEN
           . = ALIGN(PAGE_SIZE);
           __xen_start_gate_section = .;
-          *(.data.gate.xen)
+          *(.data..gate.xen)
           __xen_stop_gate_section = .;
 #endif
         }