10 files changed, 128 insertions, 86 deletions

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 2e6310b8eab7..59b91ac861ac 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -54,6 +54,11 @@ config ARCH_HAS_ILOG2_U64
         bool
         default n
 
+config HUGETLB_PAGE_SIZE_VARIABLE
+        bool
+        depends on HUGETLB_PAGE
+        default y
+
 config GENERIC_FIND_NEXT_BIT
         bool
         default y
@@ -300,6 +305,9 @@ config HOTPLUG_CPU
 config ARCH_ENABLE_MEMORY_HOTPLUG
         def_bool y
 
+config ARCH_ENABLE_MEMORY_HOTREMOVE
+        def_bool y
+
 config SCHED_SMT
         bool "SMT scheduler support"
         depends on SMP
@@ -348,6 +356,7 @@ config ARCH_FLATMEM_ENABLE
 config ARCH_SPARSEMEM_ENABLE
         def_bool y
         depends on ARCH_DISCONTIGMEM_ENABLE
+        select SPARSEMEM_VMEMMAP_ENABLE
 
 config ARCH_DISCONTIGMEM_DEFAULT
         def_bool y if (IA64_SGI_SN2 || IA64_GENERIC || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB)
diff --git a/arch/ia64/kernel/gate.lds.S b/arch/ia64/kernel/gate.lds.S
index 6d198339bf85..44817d97ab43 100644
--- a/arch/ia64/kernel/gate.lds.S
+++ b/arch/ia64/kernel/gate.lds.S
@@ -1,7 +1,8 @@
 /*
- * Linker script for gate DSO.  The gate pages are an ELF shared object prelinked to its
- * virtual address, with only one read-only segment and one execute-only segment (both fit
- * in one page).  This script controls its layout.
+ * Linker script for gate DSO.  The gate pages are an ELF shared object
+ * prelinked to its virtual address, with only one read-only segment and
+ * one execute-only segment (both fit in one page).  This script controls
+ * its layout.
  */
 
 
@@ -9,72 +10,80 @@
 
 SECTIONS
 {
-  . = GATE_ADDR + SIZEOF_HEADERS;
-
-  .hash                         : { *(.hash) }                          :readable
-  .gnu.hash                     : { *(.gnu.hash) }
-  .dynsym                       : { *(.dynsym) }
-  .dynstr                       : { *(.dynstr) }
-  .gnu.version                  : { *(.gnu.version) }
-  .gnu.version_d                : { *(.gnu.version_d) }
-  .gnu.version_r                : { *(.gnu.version_r) }
-  .dynamic                      : { *(.dynamic) }                       :readable :dynamic
-
-  /*
-   * This linker script is used both with -r and with -shared.  For the layouts to match,
-   * we need to skip more than enough space for the dynamic symbol table et al.  If this
-   * amount is insufficient, ld -shared will barf.  Just increase it here.
-   */
-  . = GATE_ADDR + 0x500;
-
-  .data.patch                   : {
-                                    __start_gate_mckinley_e9_patchlist = .;
-                                    *(.data.patch.mckinley_e9)
-                                    __end_gate_mckinley_e9_patchlist = .;
-
-                                    __start_gate_vtop_patchlist = .;
-                                    *(.data.patch.vtop)
-                                    __end_gate_vtop_patchlist = .;
-
-                                    __start_gate_fsyscall_patchlist = .;
-                                    *(.data.patch.fsyscall_table)
-                                    __end_gate_fsyscall_patchlist = .;
-
-                                    __start_gate_brl_fsys_bubble_down_patchlist = .;
-                                    *(.data.patch.brl_fsys_bubble_down)
-                                    __end_gate_brl_fsys_bubble_down_patchlist = .;
-  }                                                                     :readable
-  .IA_64.unwind_info            : { *(.IA_64.unwind_info*) }
-  .IA_64.unwind                 : { *(.IA_64.unwind*) }                 :readable :unwind
+        . = GATE_ADDR + SIZEOF_HEADERS;
+
+        .hash                   : { *(.hash) }          :readable
+        .gnu.hash               : { *(.gnu.hash) }
+        .dynsym                 : { *(.dynsym) }
+        .dynstr                 : { *(.dynstr) }
+        .gnu.version            : { *(.gnu.version) }
+        .gnu.version_d          : { *(.gnu.version_d) }
+        .gnu.version_r          : { *(.gnu.version_r) }
+
+        .dynamic                : { *(.dynamic) }       :readable       :dynamic
+
+        /*
+         * This linker script is used both with -r and with -shared.  For
+         * the layouts to match, we need to skip more than enough space for
+         * the dynamic symbol table et al.  If this amount is insufficient,
+         * ld -shared will barf.  Just increase it here.
+         */
+        . = GATE_ADDR + 0x500;
+
+        .data.patch             : {
+                __start_gate_mckinley_e9_patchlist = .;
+                *(.data.patch.mckinley_e9)
+                __end_gate_mckinley_e9_patchlist = .;
+
+                __start_gate_vtop_patchlist = .;
+                *(.data.patch.vtop)
+                __end_gate_vtop_patchlist = .;
+
+                __start_gate_fsyscall_patchlist = .;
+                *(.data.patch.fsyscall_table)
+                __end_gate_fsyscall_patchlist = .;
+
+                __start_gate_brl_fsys_bubble_down_patchlist = .;
+                *(.data.patch.brl_fsys_bubble_down)
+                __end_gate_brl_fsys_bubble_down_patchlist = .;
+        }                                               :readable
+
+        .IA_64.unwind_info      : { *(.IA_64.unwind_info*) }
+        .IA_64.unwind           : { *(.IA_64.unwind*) } :readable       :unwind
 #ifdef HAVE_BUGGY_SEGREL
-  .text (GATE_ADDR + PAGE_SIZE) : { *(.text) *(.text.*) }               :readable
+        .text (GATE_ADDR + PAGE_SIZE) : { *(.text) *(.text.*) } :readable
 #else
-  . = ALIGN (PERCPU_PAGE_SIZE) + (. & (PERCPU_PAGE_SIZE - 1));
-  .text                         : { *(.text) *(.text.*) }               :epc
+        . = ALIGN(PERCPU_PAGE_SIZE) + (. & (PERCPU_PAGE_SIZE - 1));
+        .text                   : { *(.text) *(.text.*) }       :epc
 #endif
 
-  /DISCARD/                     : {
-        *(.got.plt) *(.got)
-        *(.data .data.* .gnu.linkonce.d.*)
-        *(.dynbss)
-        *(.bss .bss.* .gnu.linkonce.b.*)
-        *(__ex_table)
-        *(__mca_table)
-  }
+        /DISCARD/               : {
+                *(.got.plt) *(.got)
+                *(.data .data.* .gnu.linkonce.d.*)
+                *(.dynbss)
+                *(.bss .bss.* .gnu.linkonce.b.*)
+                *(__ex_table)
+                *(__mca_table)
+        }
 }
 
 /*
+ * ld does not recognize this name token; use the constant.
+ */
+#define PT_IA_64_UNWIND 0x70000001
+
+/*
  * We must supply the ELF program headers explicitly to get just one
  * PT_LOAD segment, and set the flags explicitly to make segments read-only.
  */
 PHDRS
 {
-  readable  PT_LOAD     FILEHDR PHDRS   FLAGS(4);       /* PF_R */
+        readable        PT_LOAD FILEHDR PHDRS   FLAGS(4);       /* PF_R */
 #ifndef HAVE_BUGGY_SEGREL
-  epc       PT_LOAD     FILEHDR PHDRS   FLAGS(1);       /* PF_X */
+        epc             PT_LOAD FILEHDR PHDRS   FLAGS(1);       /* PF_X */
 #endif
-  dynamic   PT_DYNAMIC                  FLAGS(4);       /* PF_R */
-  unwind    0x70000001; /* PT_IA_64_UNWIND, but ld doesn't match the name */
+        dynamic         PT_DYNAMIC              FLAGS(4);       /* PF_R */
+        unwind          PT_IA_64_UNWIND;
 }
 
 /*
@@ -82,14 +91,14 @@ PHDRS
  */
 VERSION
 {
-  LINUX_2.5 {
-    global:
-        __kernel_syscall_via_break;
-        __kernel_syscall_via_epc;
-        __kernel_sigtramp;
-
-    local: *;
-  };
+        LINUX_2.5 {
+        global:
+                __kernel_syscall_via_break;
+                __kernel_syscall_via_epc;
+                __kernel_sigtramp;
+
+        local: *;
+        };
 }
 
 /* The ELF entry point can be used to set the AT_SYSINFO value.  */
diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c
index 5dc98b5abcfb..5fd65d8302c8 100644
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
@@ -40,6 +40,8 @@ extern void jprobe_inst_return(void);
 DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL;
 DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);
 
+struct kretprobe_blackpoint kretprobe_blacklist[] = {{NULL, NULL}};
+
 enum instruction_type {A, I, M, F, B, L, X, u};
 static enum instruction_type bundle_encoding[32][3] = {
   { M, I, I },                          /* 00 */
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 9e392a30d197..777c8d8bd5e7 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -528,10 +528,6 @@ setup_arch (char **cmdline_p)
 
 #ifdef CONFIG_SMP
         cpu_physical_id(0) = hard_smp_processor_id();
-
-        cpu_set(0, cpu_sibling_map[0]);
-        cpu_set(0, cpu_core_map[0]);
-
         check_for_logical_procs();
         if (smp_num_cpucores > 1)
                 printk(KERN_INFO
@@ -873,6 +869,14 @@ cpu_init (void)
         void *cpu_data;
 
         cpu_data = per_cpu_init();
+        /*
+         * insert boot cpu into sibling and core mapes
+         * (must be done after per_cpu area is setup)
+         */
+        if (smp_processor_id() == 0) {
+                cpu_set(0, per_cpu(cpu_sibling_map, 0));
+                cpu_set(0, cpu_core_map[0]);
+        }
 
         /*
          * We set ar.k3 so that assembly code in MCA handler can compute
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index 308772f7cddc..c57dbce25c12 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -138,7 +138,9 @@ cpumask_t cpu_possible_map = CPU_MASK_NONE;
 EXPORT_SYMBOL(cpu_possible_map);
 
 cpumask_t cpu_core_map[NR_CPUS] __cacheline_aligned;
-cpumask_t cpu_sibling_map[NR_CPUS] __cacheline_aligned;
+DEFINE_PER_CPU_SHARED_ALIGNED(cpumask_t, cpu_sibling_map);
+EXPORT_PER_CPU_SYMBOL(cpu_sibling_map);
+
 int smp_num_siblings = 1;
 int smp_num_cpucores = 1;
 
@@ -650,12 +652,12 @@ clear_cpu_sibling_map(int cpu)
 {
         int i;
 
-        for_each_cpu_mask(i, cpu_sibling_map[cpu])
-                cpu_clear(cpu, cpu_sibling_map[i]);
+        for_each_cpu_mask(i, per_cpu(cpu_sibling_map, cpu))
+                cpu_clear(cpu, per_cpu(cpu_sibling_map, i));
         for_each_cpu_mask(i, cpu_core_map[cpu])
                 cpu_clear(cpu, cpu_core_map[i]);
 
-        cpu_sibling_map[cpu] = cpu_core_map[cpu] = CPU_MASK_NONE;
+        per_cpu(cpu_sibling_map, cpu) = cpu_core_map[cpu] = CPU_MASK_NONE;
 }
 
 static void
@@ -666,7 +668,7 @@ remove_siblinginfo(int cpu)
         if (cpu_data(cpu)->threads_per_core == 1 &&
             cpu_data(cpu)->cores_per_socket == 1) {
                 cpu_clear(cpu, cpu_core_map[cpu]);
-                cpu_clear(cpu, cpu_sibling_map[cpu]);
+                cpu_clear(cpu, per_cpu(cpu_sibling_map, cpu));
                 return;
         }
 
@@ -807,8 +809,8 @@ set_cpu_sibling_map(int cpu)
                         cpu_set(i, cpu_core_map[cpu]);
                         cpu_set(cpu, cpu_core_map[i]);
                         if (cpu_data(cpu)->core_id == cpu_data(i)->core_id) {
-                                cpu_set(i, cpu_sibling_map[cpu]);
-                                cpu_set(cpu, cpu_sibling_map[i]);
+                                cpu_set(i, per_cpu(cpu_sibling_map, cpu));
+                                cpu_set(cpu, per_cpu(cpu_sibling_map, i));
                         }
                 }
         }
@@ -839,7 +841,7 @@ __cpu_up (unsigned int cpu)
 
         if (cpu_data(cpu)->threads_per_core == 1 &&
             cpu_data(cpu)->cores_per_socket == 1) {
-                cpu_set(cpu, cpu_sibling_map[cpu]);
+                cpu_set(cpu, per_cpu(cpu_sibling_map, cpu));
                 cpu_set(cpu, cpu_core_map[cpu]);
                 return 0;
         }
diff --git a/arch/ia64/kernel/uncached.c b/arch/ia64/kernel/uncached.c
index c58e933694d5..a7be4f203420 100644
--- a/arch/ia64/kernel/uncached.c
+++ b/arch/ia64/kernel/uncached.c
@@ -196,7 +196,7 @@ unsigned long uncached_alloc_page(int starting_nid)
         nid = starting_nid;
 
         do {
-                if (!node_online(nid))
+                if (!node_state(nid, N_HIGH_MEMORY))
                         continue;
                 uc_pool = &uncached_pools[nid];
                 if (uc_pool->pool == NULL)
@@ -268,7 +268,7 @@ static int __init uncached_init(void)
 {
         int nid;
 
-        for_each_online_node(nid) {
+        for_each_node_state(nid, N_ONLINE) {
                 uncached_pools[nid].pool = gen_pool_create(PAGE_SHIFT, nid);
                 mutex_init(&uncached_pools[nid].add_chunk_mutex);
         }
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index 0d34585058c8..5628067a74d2 100644
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -715,3 +715,11 @@ void arch_refresh_nodedata(int update_node, pg_data_t *update_pgdat)
         scatter_node_data();
 }
 #endif
+
+#ifdef CONFIG_SPARSEMEM_VMEMMAP
+int __meminit vmemmap_populate(struct page *start_page,
+                                                unsigned long size, int node)
+{
+        return vmemmap_populate_basepages(start_page, size, node);
+}
+#endif
diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
index 9150ffaff9e8..32f26253c4e8 100644
--- a/arch/ia64/mm/fault.c
+++ b/arch/ia64/mm/fault.c
@@ -281,6 +281,6 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
         }
         printk(KERN_CRIT "VM: killing process %s\n", current->comm);
         if (user_mode(regs))
-                do_exit(SIGKILL);
+                do_group_exit(SIGKILL);
         goto no_context;
 }
diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
index a9ff685aea25..d3ce8f3bcaa6 100644
--- a/arch/ia64/mm/hugetlbpage.c
+++ b/arch/ia64/mm/hugetlbpage.c
@@ -194,6 +194,6 @@ static int __init hugetlb_setup_sz(char *str)
          * override here with new page shift.
          */
         ia64_set_rr(HPAGE_REGION_BASE, hpage_shift << 2);
-        return 1;
+        return 0;
 }
-__setup("hugepagesz=", hugetlb_setup_sz);
+early_param("hugepagesz", hugetlb_setup_sz);
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index c14abefabafa..3e10152abbf0 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -54,15 +54,12 @@ struct page *zero_page_memmap_ptr;	/* map entry for zero page */
 EXPORT_SYMBOL(zero_page_memmap_ptr);
 
 void
-lazy_mmu_prot_update (pte_t pte)
+__ia64_sync_icache_dcache (pte_t pte)
 {
         unsigned long addr;
         struct page *page;
         unsigned long order;
 
-        if (!pte_exec(pte))
-                return;                         /* not an executable page... */
-
         page = pte_page(pte);
         addr = (unsigned long) page_address(page);
 
@@ -721,10 +718,21 @@ int arch_add_memory(int nid, u64 start, u64 size)
 
         return ret;
 }
-
+#ifdef CONFIG_MEMORY_HOTREMOVE
 int remove_memory(u64 start, u64 size)
 {
-        return -EINVAL;
+        unsigned long start_pfn, end_pfn;
+        unsigned long timeout = 120 * HZ;
+        int ret;
+        start_pfn = start >> PAGE_SHIFT;
+        end_pfn = start_pfn + (size >> PAGE_SHIFT);
+        ret = offline_pages(start_pfn, end_pfn, timeout);
+        if (ret)
+                goto out;
+        /* we can free mem_map at this point */
+out:
+        return ret;
 }
 EXPORT_SYMBOL_GPL(remove_memory);
+#endif /* CONFIG_MEMORY_HOTREMOVE */
 #endif