14 files changed, 36 insertions, 64 deletions

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 6e41471449c0..de1bff659969 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -31,6 +31,10 @@ config ZONE_DMA
         def_bool y
         depends on !IA64_SGI_SN2
 
+config QUICKLIST
+        bool
+        default y
+
 config MMU
         bool
         default y
diff --git a/arch/ia64/hp/common/hwsw_iommu.c b/arch/ia64/hp/common/hwsw_iommu.c
index 2153bcacbe6c..94e57109fad6 100644
--- a/arch/ia64/hp/common/hwsw_iommu.c
+++ b/arch/ia64/hp/common/hwsw_iommu.c
@@ -63,7 +63,7 @@ use_swiotlb (struct device *dev)
         return dev && dev->dma_mask && !hwiommu_dma_supported(dev, *dev->dma_mask);
 }
 
-void
+void __init
 hwsw_init (void)
 {
         /* default to a smallish 2MB sw I/O TLB */
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index b50bf208678e..144b056282af 100644
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -1583,5 +1583,7 @@ sys_call_table:
         data8 sys_vmsplice
         data8 sys_ni_syscall                    // reserved for move_pages
         data8 sys_getcpu
+        data8 sys_epoll_pwait                   // 1305
+        data8 sys_utimensat
 
         .org sys_call_table + 8*NR_syscalls     // guard against failures to increase NR_syscalls
diff --git a/arch/ia64/kernel/err_inject.c b/arch/ia64/kernel/err_inject.c
index 6a49600cf337..b642648cc2ac 100644
--- a/arch/ia64/kernel/err_inject.c
+++ b/arch/ia64/kernel/err_inject.c
@@ -291,5 +291,5 @@ module_init(err_inject_init);
 module_exit(err_inject_exit);
 
 MODULE_AUTHOR("Fenghua Yu <fenghua.yu@intel.com>");
-MODULE_DESCRIPTION("MC error injection kenrel sysfs interface");
+MODULE_DESCRIPTION("MC error injection kernel sysfs interface");
 MODULE_LICENSE("GPL");
diff --git a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c
index ce49c85c928f..b4c239685d2e 100644
--- a/arch/ia64/kernel/irq.c
+++ b/arch/ia64/kernel/irq.c
@@ -104,6 +104,17 @@ void set_irq_affinity_info (unsigned int irq, int hwid, int redir)
                 irq_redir[irq] = (char) (redir & 0xff);
         }
 }
+
+bool is_affinity_mask_valid(cpumask_t cpumask)
+{
+        if (ia64_platform_is("sn2")) {
+                /* Only allow one CPU to be specified in the smp_affinity mask */
+                if (cpus_weight(cpumask) != 1)
+                        return false;
+        }
+        return true;
+}
+
 #endif /* CONFIG_SMP */
 
 #ifdef CONFIG_HOTPLUG_CPU
diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c
index 4f5fd0960ba7..72e593e94053 100644
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
@@ -370,14 +370,18 @@ static int __kprobes valid_kprobe_addr(int template, int slot,
 
 static void __kprobes save_previous_kprobe(struct kprobe_ctlblk *kcb)
 {
-        kcb->prev_kprobe.kp = kprobe_running();
-        kcb->prev_kprobe.status = kcb->kprobe_status;
+        unsigned int i;
+        i = atomic_add_return(1, &kcb->prev_kprobe_index);
+        kcb->prev_kprobe[i-1].kp = kprobe_running();
+        kcb->prev_kprobe[i-1].status = kcb->kprobe_status;
 }
 
 static void __kprobes restore_previous_kprobe(struct kprobe_ctlblk *kcb)
 {
-        __get_cpu_var(current_kprobe) = kcb->prev_kprobe.kp;
-        kcb->kprobe_status = kcb->prev_kprobe.status;
+        unsigned int i;
+        i = atomic_sub_return(1, &kcb->prev_kprobe_index);
+        __get_cpu_var(current_kprobe) = kcb->prev_kprobe[i].kp;
+        kcb->kprobe_status = kcb->prev_kprobe[i].status;
 }
 
 static void __kprobes set_current_kprobe(struct kprobe *p,
diff --git a/arch/ia64/kernel/machvec.c b/arch/ia64/kernel/machvec.c
index 9620822270a6..13df337508e7 100644
--- a/arch/ia64/kernel/machvec.c
+++ b/arch/ia64/kernel/machvec.c
@@ -35,7 +35,7 @@ lookup_machvec (const char *name)
         return 0;
 }
 
-void
+void __init
 machvec_init (const char *name)
 {
         struct ia64_machine_vector *mv;
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index f8ae709de0b5..26814de6c29a 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -118,7 +118,9 @@ static ia64_mc_info_t		ia64_mc_info;
 #define CPE_HISTORY_LENGTH    5
 #define CMC_HISTORY_LENGTH    5
 
+#ifdef CONFIG_ACPI
 static struct timer_list cpe_poll_timer;
+#endif
 static struct timer_list cmc_poll_timer;
 /*
  * This variable tells whether we are currently in polling mode.
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index 44ce5ed9444c..7ac8592a35b6 100644
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -88,7 +88,7 @@ void show_mem(void)
         printk(KERN_INFO "%d pages shared\n", total_shared);
         printk(KERN_INFO "%d pages swap cached\n", total_cached);
         printk(KERN_INFO "Total of %ld pages in page table cache\n",
-               pgtable_quicklist_total_size());
+               quicklist_total_size());
         printk(KERN_INFO "%d free buffer pages\n", nr_free_buffer_pages());
 }
 
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index 94844442812a..38085ac18338 100644
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -561,7 +561,7 @@ void show_mem(void)
         printk(KERN_INFO "%d pages shared\n", total_shared);
         printk(KERN_INFO "%d pages swap cached\n", total_cached);
         printk(KERN_INFO "Total of %ld pages in page table cache\n",
-               pgtable_quicklist_total_size());
+               quicklist_total_size());
         printk(KERN_INFO "%d free buffer pages\n", nr_free_buffer_pages());
 }
 
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index cffb1e8325e8..c14abefabafa 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -39,9 +39,6 @@
 
 DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
 
-DEFINE_PER_CPU(unsigned long *, __pgtable_quicklist);
-DEFINE_PER_CPU(long, __pgtable_quicklist_size);
-
 extern void ia64_tlb_init (void);
 
 unsigned long MAX_DMA_ADDRESS = PAGE_OFFSET + 0x100000000UL;
@@ -56,54 +53,6 @@ EXPORT_SYMBOL(vmem_map);
 struct page *zero_page_memmap_ptr;      /* map entry for zero page */
 EXPORT_SYMBOL(zero_page_memmap_ptr);
 
-#define MIN_PGT_PAGES                   25UL
-#define MAX_PGT_FREES_PER_PASS          16L
-#define PGT_FRACTION_OF_NODE_MEM        16
-
-static inline long
-max_pgt_pages(void)
-{
-        u64 node_free_pages, max_pgt_pages;
-
-#ifndef CONFIG_NUMA
-        node_free_pages = nr_free_pages();
-#else
-        node_free_pages = node_page_state(numa_node_id(), NR_FREE_PAGES);
-#endif
-        max_pgt_pages = node_free_pages / PGT_FRACTION_OF_NODE_MEM;
-        max_pgt_pages = max(max_pgt_pages, MIN_PGT_PAGES);
-        return max_pgt_pages;
-}
-
-static inline long
-min_pages_to_free(void)
-{
-        long pages_to_free;
-
-        pages_to_free = pgtable_quicklist_size - max_pgt_pages();
-        pages_to_free = min(pages_to_free, MAX_PGT_FREES_PER_PASS);
-        return pages_to_free;
-}
-
-void
-check_pgt_cache(void)
-{
-        long pages_to_free;
-
-        if (unlikely(pgtable_quicklist_size <= MIN_PGT_PAGES))
-                return;
-
-        preempt_disable();
-        while (unlikely((pages_to_free = min_pages_to_free()) > 0)) {
-                while (pages_to_free--) {
-                        free_page((unsigned long)pgtable_quicklist_alloc());
-                }
-                preempt_enable();
-                preempt_disable();
-        }
-        preempt_enable();
-}
-
 void
 lazy_mmu_prot_update (pte_t pte)
 {
diff --git a/arch/ia64/sn/kernel/io_common.c b/arch/ia64/sn/kernel/io_common.c
index d48bcd83253c..7ed72d3faf73 100644
--- a/arch/ia64/sn/kernel/io_common.c
+++ b/arch/ia64/sn/kernel/io_common.c
@@ -364,7 +364,7 @@ void sn_bus_store_sysdata(struct pci_dev *dev)
 
         element = kzalloc(sizeof(struct sysdata_el), GFP_KERNEL);
         if (!element) {
-                dev_dbg(dev, "%s: out of memory!\n", __FUNCTION__);
+                dev_dbg(&dev->dev, "%s: out of memory!\n", __FUNCTION__);
                 return;
         }
         element->sysdata = SN_PCIDEV_INFO(dev);
diff --git a/arch/ia64/sn/kernel/xpc_partition.c b/arch/ia64/sn/kernel/xpc_partition.c
index 57c723f5cba4..7ba403232cb8 100644
--- a/arch/ia64/sn/kernel/xpc_partition.c
+++ b/arch/ia64/sn/kernel/xpc_partition.c
@@ -574,7 +574,7 @@ xpc_update_partition_info(struct xpc_partition *part, u8 remote_rp_version,
                 u64 remote_vars_pa, struct xpc_vars *remote_vars)
 {
         part->remote_rp_version = remote_rp_version;
-        dev_dbg(xpc_part, "  remote_rp_version = 0x%016lx\n",
+        dev_dbg(xpc_part, "  remote_rp_version = 0x%016x\n",
                 part->remote_rp_version);
 
         part->remote_rp_stamp = *remote_rp_stamp;
diff --git a/arch/ia64/sn/kernel/xpnet.c b/arch/ia64/sn/kernel/xpnet.c
index 88fad85ceeff..da7213530972 100644
--- a/arch/ia64/sn/kernel/xpnet.c
+++ b/arch/ia64/sn/kernel/xpnet.c
@@ -343,8 +343,8 @@ xpnet_dev_open(struct net_device *dev)
         enum xpc_retval ret;
 
 
-        dev_dbg(xpnet, "calling xpc_connect(%d, 0x%p, NULL, %ld, %ld, %d, "
-                "%d)\n", XPC_NET_CHANNEL, xpnet_connection_activity,
+        dev_dbg(xpnet, "calling xpc_connect(%d, 0x%p, NULL, %ld, %ld, %ld, "
+                "%ld)\n", XPC_NET_CHANNEL, xpnet_connection_activity,
                 XPNET_MSG_SIZE, XPNET_MSG_NENTRIES, XPNET_MAX_KTHREADS,
                 XPNET_MAX_IDLE_KTHREADS);