19 files changed, 180 insertions, 270 deletions

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 10b6b9e7716b..edffe25a477a 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -34,6 +34,10 @@ config RWSEM_XCHGADD_ALGORITHM
         bool
         default y
 
+config GENERIC_FIND_NEXT_BIT
+        bool
+        default y
+
 config GENERIC_CALIBRATE_DELAY
         bool
         default y
@@ -42,6 +46,10 @@ config TIME_INTERPOLATION
         bool
         default y
 
+config DMI
+        bool
+        default y
+
 config EFI
         bool
         default y
diff --git a/arch/ia64/ia32/ia32priv.h b/arch/ia64/ia32/ia32priv.h
index 68ceb4e690c7..ccb98ed48e58 100644
--- a/arch/ia64/ia32/ia32priv.h
+++ b/arch/ia64/ia32/ia32priv.h
@@ -29,9 +29,9 @@
 struct partial_page {
         struct partial_page     *next; /* linked list, sorted by address */
         struct rb_node          pp_rb;
-        /* 64K is the largest "normal" page supported by ia64 ABI. So 4K*32
+        /* 64K is the largest "normal" page supported by ia64 ABI. So 4K*64
          * should suffice.*/
-        unsigned int            bitmap;
+        unsigned long           bitmap;
         unsigned int            base;
 };
 
diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c
index 13e739e4c84d..5366b3b23d09 100644
--- a/arch/ia64/ia32/sys_ia32.c
+++ b/arch/ia64/ia32/sys_ia32.c
@@ -25,7 +25,6 @@
 #include <linux/resource.h>
 #include <linux/times.h>
 #include <linux/utsname.h>
-#include <linux/timex.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
 #include <linux/sem.h>
@@ -2591,78 +2590,4 @@ sys32_setresgid(compat_gid_t rgid, compat_gid_t egid,
         ssgid = (sgid == (compat_gid_t)-1) ? ((gid_t)-1) : ((gid_t)sgid);
         return sys_setresgid(srgid, segid, ssgid);
 }
-
-/* Handle adjtimex compatibility. */
-
-struct timex32 {
-        u32 modes;
-        s32 offset, freq, maxerror, esterror;
-        s32 status, constant, precision, tolerance;
-        struct compat_timeval time;
-        s32 tick;
-        s32 ppsfreq, jitter, shift, stabil;
-        s32 jitcnt, calcnt, errcnt, stbcnt;
-        s32  :32; s32  :32; s32  :32; s32  :32;
-        s32  :32; s32  :32; s32  :32; s32  :32;
-        s32  :32; s32  :32; s32  :32; s32  :32;
-};
-
-extern int do_adjtimex(struct timex *);
-
-asmlinkage long
-sys32_adjtimex(struct timex32 *utp)
-{
-        struct timex txc;
-        int ret;
-
-        memset(&txc, 0, sizeof(struct timex));
-
-        if(get_user(txc.modes, &utp->modes) ||
-           __get_user(txc.offset, &utp->offset) ||
-           __get_user(txc.freq, &utp->freq) ||
-           __get_user(txc.maxerror, &utp->maxerror) ||
-           __get_user(txc.esterror, &utp->esterror) ||
-           __get_user(txc.status, &utp->status) ||
-           __get_user(txc.constant, &utp->constant) ||
-           __get_user(txc.precision, &utp->precision) ||
-           __get_user(txc.tolerance, &utp->tolerance) ||
-           __get_user(txc.time.tv_sec, &utp->time.tv_sec) ||
-           __get_user(txc.time.tv_usec, &utp->time.tv_usec) ||
-           __get_user(txc.tick, &utp->tick) ||
-           __get_user(txc.ppsfreq, &utp->ppsfreq) ||
-           __get_user(txc.jitter, &utp->jitter) ||
-           __get_user(txc.shift, &utp->shift) ||
-           __get_user(txc.stabil, &utp->stabil) ||
-           __get_user(txc.jitcnt, &utp->jitcnt) ||
-           __get_user(txc.calcnt, &utp->calcnt) ||
-           __get_user(txc.errcnt, &utp->errcnt) ||
-           __get_user(txc.stbcnt, &utp->stbcnt))
-                return -EFAULT;
-
-        ret = do_adjtimex(&txc);
-
-        if(put_user(txc.modes, &utp->modes) ||
-           __put_user(txc.offset, &utp->offset) ||
-           __put_user(txc.freq, &utp->freq) ||
-           __put_user(txc.maxerror, &utp->maxerror) ||
-           __put_user(txc.esterror, &utp->esterror) ||
-           __put_user(txc.status, &utp->status) ||
-           __put_user(txc.constant, &utp->constant) ||
-           __put_user(txc.precision, &utp->precision) ||
-           __put_user(txc.tolerance, &utp->tolerance) ||
-           __put_user(txc.time.tv_sec, &utp->time.tv_sec) ||
-           __put_user(txc.time.tv_usec, &utp->time.tv_usec) ||
-           __put_user(txc.tick, &utp->tick) ||
-           __put_user(txc.ppsfreq, &utp->ppsfreq) ||
-           __put_user(txc.jitter, &utp->jitter) ||
-           __put_user(txc.shift, &utp->shift) ||
-           __put_user(txc.stabil, &utp->stabil) ||
-           __put_user(txc.jitcnt, &utp->jitcnt) ||
-           __put_user(txc.calcnt, &utp->calcnt) ||
-           __put_user(txc.errcnt, &utp->errcnt) ||
-           __put_user(txc.stbcnt, &utp->stbcnt))
-                ret = -EFAULT;
-
-        return ret;
-}
 #endif /* NOTYET */
diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile
index 09a0dbc17fb6..59e871dae742 100644
--- a/arch/ia64/kernel/Makefile
+++ b/arch/ia64/kernel/Makefile
@@ -7,7 +7,7 @@ extra-y	:= head.o init_task.o vmlinux.lds
 obj-y := acpi.o entry.o efi.o efi_stub.o gate-data.o fsys.o ia64_ksyms.o irq.o irq_ia64.o       \
          irq_lsapic.o ivt.o machvec.o pal.o patch.o process.o perfmon.o ptrace.o sal.o          \
          salinfo.o semaphore.o setup.o signal.o sys_ia64.o time.o traps.o unaligned.o \
-         unwind.o mca.o mca_asm.o topology.o
+         unwind.o mca.o mca_asm.o topology.o dmi_scan.o
 
 obj-$(CONFIG_IA64_BRL_EMU)      += brl_emu.o
 obj-$(CONFIG_IA64_GENERIC)      += acpi-ext.o
@@ -30,6 +30,7 @@ obj-$(CONFIG_IA64_MCA_RECOVERY)	+= mca_recovery.o
 obj-$(CONFIG_KPROBES)           += kprobes.o jprobes.o
 obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR)   += uncached.o
 mca_recovery-y                  += mca_drv.o mca_drv_asm.o
+dmi_scan-y                      += ../../i386/kernel/dmi_scan.o
 
 # The gate DSO image is built using a special linker script.
 targets += gate.so gate-syms.o
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index a4e218ce2edb..58c93a30348c 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -651,9 +651,9 @@ unsigned long __init acpi_find_rsdp(void)
 {
         unsigned long rsdp_phys = 0;
 
-        if (efi.acpi20)
-                rsdp_phys = __pa(efi.acpi20);
-        else if (efi.acpi)
+        if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)
+                rsdp_phys = efi.acpi20;
+        else if (efi.acpi != EFI_INVALID_TABLE_ADDR)
                 printk(KERN_WARNING PREFIX
                        "v1.0/r0.71 tables no longer supported\n");
         return rsdp_phys;
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c
index 9990320b6f9a..12cfedce73b1 100644
--- a/arch/ia64/kernel/efi.c
+++ b/arch/ia64/kernel/efi.c
@@ -458,24 +458,33 @@ efi_init (void)
         printk(KERN_INFO "EFI v%u.%.02u by %s:",
                efi.systab->hdr.revision >> 16, efi.systab->hdr.revision & 0xffff, vendor);
 
+        efi.mps        = EFI_INVALID_TABLE_ADDR;
+        efi.acpi       = EFI_INVALID_TABLE_ADDR;
+        efi.acpi20     = EFI_INVALID_TABLE_ADDR;
+        efi.smbios     = EFI_INVALID_TABLE_ADDR;
+        efi.sal_systab = EFI_INVALID_TABLE_ADDR;
+        efi.boot_info  = EFI_INVALID_TABLE_ADDR;
+        efi.hcdp       = EFI_INVALID_TABLE_ADDR;
+        efi.uga        = EFI_INVALID_TABLE_ADDR;
+
         for (i = 0; i < (int) efi.systab->nr_tables; i++) {
                 if (efi_guidcmp(config_tables[i].guid, MPS_TABLE_GUID) == 0) {
-                        efi.mps = __va(config_tables[i].table);
+                        efi.mps = config_tables[i].table;
                         printk(" MPS=0x%lx", config_tables[i].table);
                 } else if (efi_guidcmp(config_tables[i].guid, ACPI_20_TABLE_GUID) == 0) {
-                        efi.acpi20 = __va(config_tables[i].table);
+                        efi.acpi20 = config_tables[i].table;
                         printk(" ACPI 2.0=0x%lx", config_tables[i].table);
                 } else if (efi_guidcmp(config_tables[i].guid, ACPI_TABLE_GUID) == 0) {
-                        efi.acpi = __va(config_tables[i].table);
+                        efi.acpi = config_tables[i].table;
                         printk(" ACPI=0x%lx", config_tables[i].table);
                 } else if (efi_guidcmp(config_tables[i].guid, SMBIOS_TABLE_GUID) == 0) {
-                        efi.smbios = __va(config_tables[i].table);
+                        efi.smbios = config_tables[i].table;
                         printk(" SMBIOS=0x%lx", config_tables[i].table);
                 } else if (efi_guidcmp(config_tables[i].guid, SAL_SYSTEM_TABLE_GUID) == 0) {
-                        efi.sal_systab = __va(config_tables[i].table);
+                        efi.sal_systab = config_tables[i].table;
                         printk(" SALsystab=0x%lx", config_tables[i].table);
                 } else if (efi_guidcmp(config_tables[i].guid, HCDP_TABLE_GUID) == 0) {
-                        efi.hcdp = __va(config_tables[i].table);
+                        efi.hcdp = config_tables[i].table;
                         printk(" HCDP=0x%lx", config_tables[i].table);
                 }
         }
@@ -677,27 +686,34 @@ EXPORT_SYMBOL(efi_mem_attributes);
 /*
  * Determines whether the memory at phys_addr supports the desired
  * attribute (WB, UC, etc).  If this returns 1, the caller can safely
- * access *size bytes at phys_addr with the specified attribute.
+ * access size bytes at phys_addr with the specified attribute.
  */
-static int
-efi_mem_attribute_range (unsigned long phys_addr, unsigned long *size, u64 attr)
+int
+efi_mem_attribute_range (unsigned long phys_addr, unsigned long size, u64 attr)
 {
+        unsigned long end = phys_addr + size;
         efi_memory_desc_t *md = efi_memory_descriptor(phys_addr);
-        unsigned long md_end;
 
-        if (!md || (md->attribute & attr) != attr)
+        /*
+         * Some firmware doesn't report MMIO regions in the EFI memory
+         * map.  The Intel BigSur (a.k.a. HP i2000) has this problem.
+         * On those platforms, we have to assume UC is valid everywhere.
+         */
+        if (!md || (md->attribute & attr) != attr) {
+                if (attr == EFI_MEMORY_UC && !efi_memmap_has_mmio())
+                        return 1;
                 return 0;
+        }
 
         do {
-                md_end = efi_md_end(md);
-                if (phys_addr + *size <= md_end)
+                unsigned long md_end = efi_md_end(md);
+
+                if (end <= md_end)
                         return 1;
 
                 md = efi_memory_descriptor(md_end);
-                if (!md || (md->attribute & attr) != attr) {
-                        *size = md_end - phys_addr;
-                        return 1;
-                }
+                if (!md || (md->attribute & attr) != attr)
+                        return 0;
         } while (md);
         return 0;
 }
@@ -708,7 +724,7 @@ efi_mem_attribute_range (unsigned long phys_addr, unsigned long *size, u64 attr)
  * control access size.
  */
 int
-valid_phys_addr_range (unsigned long phys_addr, unsigned long *size)
+valid_phys_addr_range (unsigned long phys_addr, unsigned long size)
 {
         return efi_mem_attribute_range(phys_addr, size, EFI_MEMORY_WB);
 }
@@ -723,7 +739,7 @@ valid_phys_addr_range (unsigned long phys_addr, unsigned long *size)
  * because that doesn't appear in the boot-time EFI memory map.
  */
 int
-valid_mmap_phys_addr_range (unsigned long phys_addr, unsigned long *size)
+valid_mmap_phys_addr_range (unsigned long phys_addr, unsigned long size)
 {
         if (efi_mem_attribute_range(phys_addr, size, EFI_MEMORY_WB))
                 return 1;
@@ -731,14 +747,6 @@ valid_mmap_phys_addr_range (unsigned long phys_addr, unsigned long *size)
         if (efi_mem_attribute_range(phys_addr, size, EFI_MEMORY_UC))
                 return 1;
 
-        /*
-         * Some firmware doesn't report MMIO regions in the EFI memory map.
-         * The Intel BigSur (a.k.a. HP i2000) has this problem.  In this
-         * case, we can't use the EFI memory map to validate mmap requests.
-         */
-        if (!efi_memmap_has_mmio())
-                return 1;
-
         return 0;
 }
 
diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c
index 50ae8c7d453d..789881ca83d4 100644
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
@@ -34,6 +34,7 @@
 #include <asm/pgtable.h>
 #include <asm/kdebug.h>
 #include <asm/sections.h>
+#include <asm/uaccess.h>
 
 extern void jprobe_inst_return(void);
 
@@ -722,13 +723,50 @@ static int __kprobes kprobes_fault_handler(struct pt_regs *regs, int trapnr)
         struct kprobe *cur = kprobe_running();
         struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();
 
-        if (cur->fault_handler && cur->fault_handler(cur, regs, trapnr))
-                return 1;
 
-        if (kcb->kprobe_status & KPROBE_HIT_SS) {
-                resume_execution(cur, regs);
-                reset_current_kprobe();
+        switch(kcb->kprobe_status) {
+        case KPROBE_HIT_SS:
+        case KPROBE_REENTER:
+                /*
+                 * We are here because the instruction being single
+                 * stepped caused a page fault. We reset the current
+                 * kprobe and the instruction pointer points back to
+                 * the probe address and allow the page fault handler
+                 * to continue as a normal page fault.
+                 */
+                regs->cr_iip = ((unsigned long)cur->addr) & ~0xFULL;
+                ia64_psr(regs)->ri = ((unsigned long)cur->addr) & 0xf;
+                if (kcb->kprobe_status == KPROBE_REENTER)
+                        restore_previous_kprobe(kcb);
+                else
+                        reset_current_kprobe();
                 preempt_enable_no_resched();
+                break;
+        case KPROBE_HIT_ACTIVE:
+        case KPROBE_HIT_SSDONE:
+                /*
+                 * We increment the nmissed count for accounting,
+                 * we can also use npre/npostfault count for accouting
+                 * these specific fault cases.
+                 */
+                kprobes_inc_nmissed_count(cur);
+
+                /*
+                 * We come here because instructions in the pre/post
+                 * handler caused the page_fault, this could happen
+                 * if handler tries to access user space by
+                 * copy_from_user(), get_user() etc. Let the
+                 * user-specified handler try to fix it first.
+                 */
+                if (cur->fault_handler && cur->fault_handler(cur, regs, trapnr))
+                        return 1;
+
+                /*
+                 * Let ia64_do_page_fault() fix it.
+                 */
+                break;
+        default:
+                break;
         }
 
         return 0;
@@ -740,6 +778,9 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
         struct die_args *args = (struct die_args *)data;
         int ret = NOTIFY_DONE;
 
+        if (args->regs && user_mode(args->regs))
+                return ret;
+
         switch(val) {
         case DIE_BREAK:
                 /* err is break number from ia64_bad_break() */
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index 87ff7fe33cfb..8963171788d5 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -69,6 +69,7 @@
 #include <linux/kernel.h>
 #include <linux/smp.h>
 #include <linux/workqueue.h>
+#include <linux/cpumask.h>
 
 #include <asm/delay.h>
 #include <asm/kdebug.h>
@@ -1505,7 +1506,7 @@ format_mca_init_stack(void *mca_data, unsigned long offset,
         ti->cpu = cpu;
         p->thread_info = ti;
         p->state = TASK_UNINTERRUPTIBLE;
-        __set_bit(cpu, &p->cpus_allowed);
+        cpu_set(cpu, p->cpus_allowed);
         INIT_LIST_HEAD(&p->tasks);
         p->parent = p->real_parent = p->group_leader = p;
         INIT_LIST_HEAD(&p->children);
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index 309d59658e5f..355d57970ba3 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -30,7 +30,6 @@
 #include <linux/efi.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
-#include <linux/kprobes.h>
 
 #include <asm/cpu.h>
 #include <asm/delay.h>
@@ -738,13 +737,6 @@ void
 exit_thread (void)
 {
 
-        /*
-         * Remove function-return probe instances associated with this task
-         * and put them back on the free list. Do not insert an exit probe for
-         * this function, it will be disabled by kprobe_flush_task if you do.
-         */
-        kprobe_flush_task(current);
-
         ia64_drop_fpu(current);
 #ifdef CONFIG_PERFMON
        /* if needed, stop monitoring and flush state to perfmon context */
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index eb388e271b2b..e4dfda1eb7dd 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -37,6 +37,7 @@
 #include <linux/string.h>
 #include <linux/threads.h>
 #include <linux/tty.h>
+#include <linux/dmi.h>
 #include <linux/serial.h>
 #include <linux/serial_core.h>
 #include <linux/efi.h>
@@ -433,7 +434,7 @@ setup_arch (char **cmdline_p)
         find_memory();
 
         /* process SAL system table: */
-        ia64_sal_init(efi.sal_systab);
+        ia64_sal_init(__va(efi.sal_systab));
 
         ia64_setup_printk_clock();
 
@@ -887,3 +888,10 @@ check_bugs (void)
         ia64_patch_mckinley_e9((unsigned long) __start___mckinley_e9_bundles,
                                (unsigned long) __end___mckinley_e9_bundles);
 }
+
+static int __init run_dmi_scan(void)
+{
+        dmi_scan_machine();
+        return 0;
+}
+core_initcall(run_dmi_scan);
diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c
index dabd6c32641e..7c1ddc8ac443 100644
--- a/arch/ia64/kernel/traps.c
+++ b/arch/ia64/kernel/traps.c
@@ -30,19 +30,19 @@ extern spinlock_t timerlist_lock;
 fpswa_interface_t *fpswa_interface;
 EXPORT_SYMBOL(fpswa_interface);
 
-struct notifier_block *ia64die_chain;
+ATOMIC_NOTIFIER_HEAD(ia64die_chain);
 
 int
 register_die_notifier(struct notifier_block *nb)
 {
-        return notifier_chain_register(&ia64die_chain, nb);
+        return atomic_notifier_chain_register(&ia64die_chain, nb);
 }
 EXPORT_SYMBOL_GPL(register_die_notifier);
 
 int
 unregister_die_notifier(struct notifier_block *nb)
 {
-        return notifier_chain_unregister(&ia64die_chain, nb);
+        return atomic_notifier_chain_unregister(&ia64die_chain, nb);
 }
 EXPORT_SYMBOL_GPL(unregister_die_notifier);
 
diff --git a/arch/ia64/lib/Makefile b/arch/ia64/lib/Makefile
index ac64664a1807..d8536a2c22a9 100644
--- a/arch/ia64/lib/Makefile
+++ b/arch/ia64/lib/Makefile
@@ -6,7 +6,7 @@ obj-y := io.o
 
 lib-y := __divsi3.o __udivsi3.o __modsi3.o __umodsi3.o                  \
         __divdi3.o __udivdi3.o __moddi3.o __umoddi3.o                   \
-        bitop.o checksum.o clear_page.o csum_partial_copy.o             \
+        checksum.o clear_page.o csum_partial_copy.o                     \
         clear_user.o strncpy_from_user.o strlen_user.o strnlen_user.o   \
         flush.o ip_fast_csum.o do_csum.o                                \
         memset.o strlen.o
diff --git a/arch/ia64/lib/bitop.c b/arch/ia64/lib/bitop.c
deleted file mode 100644
index 82e299c8464e..000000000000
--- a/arch/ia64/lib/bitop.c
+++ /dev/null
@@ -1,88 +0,0 @@
-#include <linux/compiler.h>
-#include <linux/types.h>
-#include <asm/intrinsics.h>
-#include <linux/module.h>
-#include <linux/bitops.h>
-
-/*
- * Find next zero bit in a bitmap reasonably efficiently..
- */
-
-int __find_next_zero_bit (const void *addr, unsigned long size, unsigned long offset)
-{
-        unsigned long *p = ((unsigned long *) addr) + (offset >> 6);
-        unsigned long result = offset & ~63UL;
-        unsigned long tmp;
-
-        if (offset >= size)
-                return size;
-        size -= result;
-        offset &= 63UL;
-        if (offset) {
-                tmp = *(p++);
-                tmp |= ~0UL >> (64-offset);
-                if (size < 64)
-                        goto found_first;
-                if (~tmp)
-                        goto found_middle;
-                size -= 64;
-                result += 64;
-        }
-        while (size & ~63UL) {
-                if (~(tmp = *(p++)))
-                        goto found_middle;
-                result += 64;
-                size -= 64;
-        }
-        if (!size)
-                return result;
-        tmp = *p;
-found_first:
-        tmp |= ~0UL << size;
-        if (tmp == ~0UL)                /* any bits zero? */
-                return result + size;   /* nope */
-found_middle:
-        return result + ffz(tmp);
-}
-EXPORT_SYMBOL(__find_next_zero_bit);
-
-/*
- * Find next bit in a bitmap reasonably efficiently..
- */
-int __find_next_bit(const void *addr, unsigned long size, unsigned long offset)
-{
-        unsigned long *p = ((unsigned long *) addr) + (offset >> 6);
-        unsigned long result = offset & ~63UL;
-        unsigned long tmp;
-
-        if (offset >= size)
-                return size;
-        size -= result;
-        offset &= 63UL;
-        if (offset) {
-                tmp = *(p++);
-                tmp &= ~0UL << offset;
-                if (size < 64)
-                        goto found_first;
-                if (tmp)
-                        goto found_middle;
-                size -= 64;
-                result += 64;
-        }
-        while (size & ~63UL) {
-                if ((tmp = *(p++)))
-                        goto found_middle;
-                result += 64;
-                size -= 64;
-        }
-        if (!size)
-                return result;
-        tmp = *p;
-  found_first:
-        tmp &= ~0UL >> (64-size);
-        if (tmp == 0UL)         /* Are any bits set? */
-                return result + size; /* Nope. */
-  found_middle:
-        return result + __ffs(tmp);
-}
-EXPORT_SYMBOL(__find_next_bit);
diff --git a/arch/ia64/mm/Makefile b/arch/ia64/mm/Makefile
index d78d20f0a0f0..bb0a01a81878 100644
--- a/arch/ia64/mm/Makefile
+++ b/arch/ia64/mm/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the ia64-specific parts of the memory manager.
 #
 
-obj-y := init.o fault.o tlb.o extable.o
+obj-y := init.o fault.o tlb.o extable.o ioremap.o
 
 obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
 obj-$(CONFIG_NUMA)         += numa.o
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index 2f5e44862e91..ec9eeb89975d 100644
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -379,31 +379,6 @@ static void __init *memory_less_node_alloc(int nid, unsigned long pernodesize)
 }
 
 /**
- * pgdat_insert - insert the pgdat into global pgdat_list
- * @pgdat: the pgdat for a node.
- */
-static void __init pgdat_insert(pg_data_t *pgdat)
-{
-        pg_data_t *prev = NULL, *next;
-
-        for_each_pgdat(next)
-                if (pgdat->node_id < next->node_id)
-                        break;
-                else
-                        prev = next;
-
-        if (prev) {
-                prev->pgdat_next = pgdat;
-                pgdat->pgdat_next = next;
-        } else {
-                pgdat->pgdat_next = pgdat_list;
-                pgdat_list = pgdat;
-        }
-
-        return;
-}
-
-/**
  * memory_less_nodes - allocate and initialize CPU only nodes pernode
  *      information.
  */
@@ -560,7 +535,7 @@ void show_mem(void)
         printk("Mem-info:\n");
         show_free_areas();
         printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
-        for_each_pgdat(pgdat) {
+        for_each_online_pgdat(pgdat) {
                 unsigned long present;
                 unsigned long flags;
                 int shared = 0, cached = 0, reserved = 0;
@@ -745,11 +720,5 @@ void __init paging_init(void)
                                     pfn_offset, zholes_size);
         }
 
-        /*
-         * Make memory less nodes become a member of the known nodes.
-         */
-        for_each_node_mask(node, memory_less_mask)
-                pgdat_insert(mem_data[node].pgdat);
-
         zero_page_memmap_ptr = virt_to_page(ia64_imva(empty_zero_page));
 }
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index ff4f31fcd330..2ef1151cde90 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -600,7 +600,7 @@ mem_init (void)
         kclist_add(&kcore_vmem, (void *)VMALLOC_START, VMALLOC_END-VMALLOC_START);
         kclist_add(&kcore_kernel, _stext, _end - _stext);
 
-        for_each_pgdat(pgdat)
+        for_each_online_pgdat(pgdat)
                 if (pgdat->bdata->node_bootmem_map)
                         totalram_pages += free_all_bootmem_node(pgdat);
 
diff --git a/arch/ia64/mm/ioremap.c b/arch/ia64/mm/ioremap.c
new file mode 100644
index 000000000000..62328621f99c
--- /dev/null
+++ b/arch/ia64/mm/ioremap.c
@@ -0,0 +1,43 @@
+/*
+ * (c) Copyright 2006 Hewlett-Packard Development Company, L.P.
+ *      Bjorn Helgaas <bjorn.helgaas@hp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/compiler.h>
+#include <linux/module.h>
+#include <linux/efi.h>
+#include <asm/io.h>
+
+static inline void __iomem *
+__ioremap (unsigned long offset, unsigned long size)
+{
+        return (void __iomem *) (__IA64_UNCACHED_OFFSET | offset);
+}
+
+void __iomem *
+ioremap (unsigned long offset, unsigned long size)
+{
+        if (efi_mem_attribute_range(offset, size, EFI_MEMORY_UC))
+                return __ioremap(offset, size);
+
+        if (efi_mem_attribute_range(offset, size, EFI_MEMORY_WB))
+                return phys_to_virt(offset);
+
+        /*
+         * Someday this should check ACPI resources so we
+         * can do the right thing for hot-plugged regions.
+         */
+        return __ioremap(offset, size);
+}
+EXPORT_SYMBOL(ioremap);
+
+void __iomem *
+ioremap_nocache (unsigned long offset, unsigned long size)
+{
+        return __ioremap(offset, size);
+}
+EXPORT_SYMBOL(ioremap_nocache);
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
index 8b6d5c844708..30988dfbddff 100644
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
@@ -327,10 +327,11 @@ sn_scan_pcdp(void)
         struct pcdp_interface_pci if_pci;
         extern struct efi efi;
 
-        pcdp = efi.hcdp;
-        if (! pcdp)
+        if (efi.hcdp == EFI_INVALID_TABLE_ADDR)
                 return;         /* no hcdp/pcdp table */
 
+        pcdp = __va(efi.hcdp);
+
         if (pcdp->rev < 3)
                 return;         /* only support PCDP (rev >= 3) */
 
diff --git a/arch/ia64/sn/kernel/sn2/sn_proc_fs.c b/arch/ia64/sn/kernel/sn2/sn_proc_fs.c
index c686d9c12f7b..5100261310f7 100644
--- a/arch/ia64/sn/kernel/sn2/sn_proc_fs.c
+++ b/arch/ia64/sn/kernel/sn2/sn_proc_fs.c
@@ -93,19 +93,22 @@ static int coherence_id_open(struct inode *inode, struct file *file)
 static struct proc_dir_entry
 *sn_procfs_create_entry(const char *name, struct proc_dir_entry *parent,
                         int (*openfunc)(struct inode *, struct file *),
-                        int (*releasefunc)(struct inode *, struct file *))
+        int (*releasefunc)(struct inode *, struct file *),
+        ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *))
 {
         struct proc_dir_entry *e = create_proc_entry(name, 0444, parent);
 
         if (e) {
-                e->proc_fops = (struct file_operations *)kmalloc(
-                        sizeof(struct file_operations), GFP_KERNEL);
-                if (e->proc_fops) {
-                        memset(e->proc_fops, 0, sizeof(struct file_operations));
-                        e->proc_fops->open = openfunc;
-                        e->proc_fops->read = seq_read;
-                        e->proc_fops->llseek = seq_lseek;
-                        e->proc_fops->release = releasefunc;
+                struct file_operations *f;
+
+                f = kzalloc(sizeof(*f), GFP_KERNEL);
+                if (f) {
+                        f->open = openfunc;
+                        f->read = seq_read;
+                        f->llseek = seq_lseek;
+                        f->release = releasefunc;
+                        f->write = write;
+                        e->proc_fops = f;
                 }
         }
 
@@ -119,31 +122,29 @@ extern int sn_topology_release(struct inode *, struct file *);
 void register_sn_procfs(void)
 {
         static struct proc_dir_entry *sgi_proc_dir = NULL;
-        struct proc_dir_entry *e;
 
         BUG_ON(sgi_proc_dir != NULL);
         if (!(sgi_proc_dir = proc_mkdir("sgi_sn", NULL)))
                 return;
 
         sn_procfs_create_entry("partition_id", sgi_proc_dir,
-                               partition_id_open, single_release);
+                partition_id_open, single_release, NULL);
 
         sn_procfs_create_entry("system_serial_number", sgi_proc_dir,
-                               system_serial_number_open, single_release);
+                system_serial_number_open, single_release, NULL);
 
         sn_procfs_create_entry("licenseID", sgi_proc_dir, 
-                               licenseID_open, single_release);
+                licenseID_open, single_release, NULL);
 
-        e = sn_procfs_create_entry("sn_force_interrupt", sgi_proc_dir, 
-                                   sn_force_interrupt_open, single_release);
-        if (e) 
-                e->proc_fops->write = sn_force_interrupt_write_proc;
+        sn_procfs_create_entry("sn_force_interrupt", sgi_proc_dir,
+                sn_force_interrupt_open, single_release,
+                sn_force_interrupt_write_proc);
 
         sn_procfs_create_entry("coherence_id", sgi_proc_dir, 
-                               coherence_id_open, single_release);
+                coherence_id_open, single_release, NULL);
         
         sn_procfs_create_entry("sn_topology", sgi_proc_dir,
-                               sn_topology_open, sn_topology_release);
+                sn_topology_open, sn_topology_release, NULL);
 }
 
 #endif /* CONFIG_PROC_FS */