3 files changed, 40 insertions, 2 deletions

diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index 0f776b032d..c87d6d1d58 100644
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -50,8 +50,10 @@ static nodemask_t memory_less_mask __initdata;
  * To prevent cache aliasing effects, align per-node structures so that they
  * start at addresses that are strided by node number.
  */
+#define MAX_NODE_ALIGN_OFFSET   (32 * 1024 * 1024)
 #define NODEDATA_ALIGN(addr, node)                                              \
-        ((((addr) + 1024*1024-1) & ~(1024*1024-1)) + (node)*PERCPU_PAGE_SIZE)
+        ((((addr) + 1024*1024-1) & ~(1024*1024-1)) +                            \
+             (((node)*PERCPU_PAGE_SIZE) & (MAX_NODE_ALIGN_OFFSET - 1)))
 
 /**
  * build_node_maps - callback to setup bootmem structs for each node
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index e3215ba64f..b38b6d213c 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -635,3 +635,39 @@ mem_init (void)
         ia32_mem_init();
 #endif
 }
+
+#ifdef CONFIG_MEMORY_HOTPLUG
+void online_page(struct page *page)
+{
+        ClearPageReserved(page);
+        set_page_count(page, 1);
+        __free_page(page);
+        totalram_pages++;
+        num_physpages++;
+}
+
+int add_memory(u64 start, u64 size)
+{
+        pg_data_t *pgdat;
+        struct zone *zone;
+        unsigned long start_pfn = start >> PAGE_SHIFT;
+        unsigned long nr_pages = size >> PAGE_SHIFT;
+        int ret;
+
+        pgdat = NODE_DATA(0);
+
+        zone = pgdat->node_zones + ZONE_NORMAL;
+        ret = __add_pages(zone, start_pfn, nr_pages);
+
+        if (ret)
+                printk("%s: Problem encountered in __add_pages() as ret=%d\n",
+                       __FUNCTION__,  ret);
+
+        return ret;
+}
+
+int remove_memory(u64 start, u64 size)
+{
+        return -EINVAL;
+}
+#endif
diff --git a/arch/ia64/mm/tlb.c b/arch/ia64/mm/tlb.c
index 41105d4544..6a4eec9113 100644
--- a/arch/ia64/mm/tlb.c
+++ b/arch/ia64/mm/tlb.c
@@ -90,7 +90,7 @@ ia64_global_tlb_purge (struct mm_struct *mm, unsigned long start,
 {
         static DEFINE_SPINLOCK(ptcg_lock);
 
-        if (mm != current->active_mm) {
+        if (mm != current->active_mm || !current->mm) {
                 flush_tlb_all();
                 return;
         }