19 files changed, 147 insertions, 111 deletions
diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c
index a065349aee37..d8a4ca021aac 100644
--- a/arch/parisc/kernel/cache.c
+++ b/arch/parisc/kernel/cache.c
@@ -29,9 +29,9 @@
 #include <asm/processor.h>
 #include <asm/sections.h>
-int split_tlb;
+int split_tlb __read_mostly;
-int dcache_stride;
+int dcache_stride __read_mostly;
-int icache_stride;
+int icache_stride __read_mostly;
 EXPORT_SYMBOL(dcache_stride);
@@ -45,29 +45,29 @@ DEFINE_SPINLOCK(pa_tlb_lock);
 EXPORT_SYMBOL(pa_tlb_lock);
 #endif
-struct pdc_cache_info cache_info;
+struct pdc_cache_info cache_info __read_mostly;
 #ifndef CONFIG_PA20
-static struct pdc_btlb_info btlb_info;
+static struct pdc_btlb_info btlb_info __read_mostly;
 #endif
 #ifdef CONFIG_SMP
 void
 flush_data_cache(void)
 {
-        on_each_cpu((void (*)(void *))flush_data_cache_local, NULL, 1, 1);
+        on_each_cpu(flush_data_cache_local, NULL, 1, 1);
 }
 void 
 flush_instruction_cache(void)
 {
-        on_each_cpu((void (*)(void *))flush_instruction_cache_local, NULL, 1, 1);
+        on_each_cpu(flush_instruction_cache_local, NULL, 1, 1);
 }
 #endif
 void
 flush_cache_all_local(void)
 {
-        flush_instruction_cache_local();
+        flush_instruction_cache_local(NULL);
-        flush_data_cache_local();
+        flush_data_cache_local(NULL);
 }
 EXPORT_SYMBOL(flush_cache_all_local);
@@ -332,7 +332,7 @@ void clear_user_page_asm(void *page, unsigned long vaddr)
 }
 #define FLUSH_THRESHOLD 0x80000 /* 0.5MB */
-int parisc_cache_flush_threshold = FLUSH_THRESHOLD;
+int parisc_cache_flush_threshold __read_mostly = FLUSH_THRESHOLD;
 void parisc_setup_cache_timing(void)
 {
diff --git a/arch/parisc/kernel/drivers.c b/arch/parisc/kernel/drivers.c
index d016d672ec2b..1eaa0d37f677 100644
--- a/arch/parisc/kernel/drivers.c
+++ b/arch/parisc/kernel/drivers.c
@@ -39,7 +39,7 @@
 #include <asm/parisc-device.h>
 /* See comments in include/asm-parisc/pci.h */
-struct hppa_dma_ops *hppa_dma_ops;
+struct hppa_dma_ops *hppa_dma_ops __read_mostly;
 EXPORT_SYMBOL(hppa_dma_ops);
 static struct device root = {
@@ -515,8 +515,13 @@ alloc_pa_dev(unsigned long hpa, struct hardware_path *mod_path)
                        (iodc_data[5] << 8) | iodc_data[6];
        dev->hpa.name = parisc_pathname(dev);
        dev->hpa.start = hpa;
-        if (hpa == 0xf4000000 || hpa == 0xf6000000 ||
+        /* This is awkward.  The STI spec says that gfx devices may occupy
-            hpa == 0xf8000000 || hpa == 0xfa000000) {
+         * 32MB or 64MB.  Unfortunately, we don't know how to tell whether
+         * it's the former or the latter.  Assumptions either way can hurt us.
+         */
+        if (hpa == 0xf4000000 || hpa == 0xf8000000) {
+                dev->hpa.end = hpa + 0x03ffffff;
+        } else if (hpa == 0xf6000000 || hpa == 0xfa000000) {
                dev->hpa.end = hpa + 0x01ffffff;
        } else {
                dev->hpa.end = hpa + 0xfff;
@@ -834,7 +839,7 @@ static void print_parisc_device(struct parisc_device *dev)
        if (dev->num_addrs) {
                int k;
-                printk(",  additional addresses: ");
+                printk(", additional addresses: ");
                for (k = 0; k < dev->num_addrs; k++)
                        printk("0x%lx ", dev->addr[k]);
        }
diff --git a/arch/parisc/kernel/firmware.c b/arch/parisc/kernel/firmware.c
index 553f8fe03224..2dc06b8e1817 100644
--- a/arch/parisc/kernel/firmware.c
+++ b/arch/parisc/kernel/firmware.c
@@ -80,7 +80,7 @@ static unsigned long pdc_result2[32] __attribute__ ((aligned (8)));
 /* Firmware needs to be initially set to narrow to determine the 
 * actual firmware width. */
-int parisc_narrow_firmware = 1;
+int parisc_narrow_firmware __read_mostly = 1;
 #endif
 /* On most currently-supported platforms, IODC I/O calls are 32-bit calls
diff --git a/arch/parisc/kernel/hardware.c b/arch/parisc/kernel/hardware.c
index 2071b5bba15c..3058bffd8a2c 100644
--- a/arch/parisc/kernel/hardware.c
+++ b/arch/parisc/kernel/hardware.c
@@ -551,6 +551,7 @@ static struct hp_hardware hp_hardware_list[] __initdata = {
        {HPHW_BCPORT, 0x804, 0x0000C, 0x10, "REO I/O BC Merced Port"}, 
        {HPHW_BCPORT, 0x782, 0x0000C, 0x00, "REO I/O BC Ropes Port"}, 
        {HPHW_BCPORT, 0x784, 0x0000C, 0x00, "Pluto I/O BC Ropes Port"}, 
+        {HPHW_BRIDGE, 0x05D, 0x0000A, 0x00, "SummitHawk Dino PCI Bridge"}, 
        {HPHW_BRIDGE, 0x680, 0x0000A, 0x00, "Dino PCI Bridge"}, 
        {HPHW_BRIDGE, 0x682, 0x0000A, 0x00, "Cujo PCI Bridge"}, 
        {HPHW_BRIDGE, 0x782, 0x0000A, 0x00, "Elroy PCI Bridge"}, 
diff --git a/arch/parisc/kernel/inventory.c b/arch/parisc/kernel/inventory.c
index 8f563871e83c..4e847ba53180 100644
--- a/arch/parisc/kernel/inventory.c
+++ b/arch/parisc/kernel/inventory.c
@@ -38,7 +38,7 @@
 */
 #undef DEBUG_PAT
-int pdc_type = PDC_TYPE_ILLEGAL;
+int pdc_type __read_mostly = PDC_TYPE_ILLEGAL;
 void __init setup_pdc(void)
 {
@@ -120,8 +120,8 @@ set_pmem_entry(physmem_range_t *pmem_ptr, unsigned long start,
         * pdc info is bad in this case).
         */
-        if (   ((start & (PAGE_SIZE - 1)) != 0)
+        if (unlikely( ((start & (PAGE_SIZE - 1)) != 0)
-            || ((pages4k & ((1UL << PDC_PAGE_ADJ_SHIFT) - 1)) != 0) ) {
+            || ((pages4k & ((1UL << PDC_PAGE_ADJ_SHIFT) - 1)) != 0) )) {
                panic("Memory range doesn't align with page size!\n");
        }
diff --git a/arch/parisc/kernel/pci-dma.c b/arch/parisc/kernel/pci-dma.c
index f94a02ef3d95..a6caf1073085 100644
--- a/arch/parisc/kernel/pci-dma.c
+++ b/arch/parisc/kernel/pci-dma.c
@@ -33,10 +33,10 @@
 #include <asm/uaccess.h>
 #include <asm/tlbflush.h>       /* for purge_tlb_*() macros */
-static struct proc_dir_entry * proc_gsc_root = NULL;
+static struct proc_dir_entry * proc_gsc_root __read_mostly = NULL;
 static int pcxl_proc_info(char *buffer, char **start, off_t offset, int length);
-static unsigned long pcxl_used_bytes = 0;
+static unsigned long pcxl_used_bytes __read_mostly = 0;
-static unsigned long pcxl_used_pages = 0;
+static unsigned long pcxl_used_pages __read_mostly = 0;
 extern unsigned long pcxl_dma_start; /* Start of pcxl dma mapping area */
 static spinlock_t   pcxl_res_lock;
diff --git a/arch/parisc/kernel/pdc_chassis.c b/arch/parisc/kernel/pdc_chassis.c
index 52004ae28d20..2a01fe1bdc98 100644
--- a/arch/parisc/kernel/pdc_chassis.c
+++ b/arch/parisc/kernel/pdc_chassis.c
@@ -30,6 +30,7 @@
 #include <linux/kernel.h>
 #include <linux/reboot.h>
 #include <linux/notifier.h>
+#include <linux/cache.h>
 #include <asm/pdc_chassis.h>
 #include <asm/processor.h>
@@ -38,8 +39,8 @@
 #ifdef CONFIG_PDC_CHASSIS
-static int pdc_chassis_old = 0; 
+static int pdc_chassis_old __read_mostly = 0;   
-static unsigned int pdc_chassis_enabled = 1;
+static unsigned int pdc_chassis_enabled __read_mostly = 1;
 /**
@@ -132,7 +133,7 @@ void __init parisc_pdc_chassis_init(void)
 {
 #ifdef CONFIG_PDC_CHASSIS
        int handle = 0;
-        if (pdc_chassis_enabled) {
+        if (likely(pdc_chassis_enabled)) {
                DPRINTK(KERN_DEBUG "%s: parisc_pdc_chassis_init()\n", __FILE__);
                /* Let see if we have something to handle... */
@@ -142,7 +143,7 @@ void __init parisc_pdc_chassis_init(void)
                        printk(KERN_INFO "Enabling PDC_PAT chassis codes support.\n");
                        handle = 1;
                }
-                else if (pdc_chassis_old) {
+                else if (unlikely(pdc_chassis_old)) {
                        printk(KERN_INFO "Enabling old style chassis LED panel support.\n");
                        handle = 1;
                }
@@ -178,7 +179,7 @@ int pdc_chassis_send_status(int message)
        /* Maybe we should do that in an other way ? */
        int retval = 0;
 #ifdef CONFIG_PDC_CHASSIS
-        if (pdc_chassis_enabled) {
+        if (likely(pdc_chassis_enabled)) {
                DPRINTK(KERN_DEBUG "%s: pdc_chassis_send_status(%d)\n", __FILE__, message);
@@ -214,7 +215,7 @@ int pdc_chassis_send_status(int message)
                        }
                } else retval = -1;
 #else
-                if (pdc_chassis_old) {
+                if (unlikely(pdc_chassis_old)) {
                        switch (message) {
                                case PDC_CHASSIS_DIRECT_BSTART:
                                case PDC_CHASSIS_DIRECT_BCOMPLETE:
diff --git a/arch/parisc/kernel/perf.c b/arch/parisc/kernel/perf.c
index f6fec62b6a2f..79dcbcccecb8 100644
--- a/arch/parisc/kernel/perf.c
+++ b/arch/parisc/kernel/perf.c
@@ -66,10 +66,10 @@ struct rdr_tbl_ent {
        uint8_t         write_control;
 };
-static int perf_processor_interface = UNKNOWN_INTF;
+static int perf_processor_interface __read_mostly = UNKNOWN_INTF;
-static int perf_enabled = 0;
+static int perf_enabled __read_mostly = 0;
 static spinlock_t perf_lock;
-struct parisc_device *cpu_device = NULL;
+struct parisc_device *cpu_device __read_mostly = NULL;
 /* RDRs to write for PCX-W */
 static int perf_rdrs_W[] = 
diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c
index fee4f1f09adc..4eb70a40ec7e 100644
--- a/arch/parisc/kernel/process.c
+++ b/arch/parisc/kernel/process.c
@@ -54,7 +54,7 @@
 #include <asm/uaccess.h>
 #include <asm/unwind.h>
-static int hlt_counter;
+static int hlt_counter __read_mostly;
 /*
 * Power off function, if any
diff --git a/arch/parisc/kernel/processor.c b/arch/parisc/kernel/processor.c
index 4f5bbcf1f5a4..6df9f62cecb5 100644
--- a/arch/parisc/kernel/processor.c
+++ b/arch/parisc/kernel/processor.c
@@ -44,10 +44,10 @@
 #include <asm/irq.h>            /* for struct irq_region */
 #include <asm/parisc-device.h>
-struct system_cpuinfo_parisc boot_cpu_data;
+struct system_cpuinfo_parisc boot_cpu_data __read_mostly;
 EXPORT_SYMBOL(boot_cpu_data);
-struct cpuinfo_parisc cpu_data[NR_CPUS];
+struct cpuinfo_parisc cpu_data[NR_CPUS] __read_mostly;
 /*
 **      PARISC CPU driver - claim "device" and initialize CPU data structures.
@@ -378,12 +378,12 @@ show_cpuinfo (struct seq_file *m, void *v)
        return 0;
 }
-static struct parisc_device_id processor_tbl[] = {
+static struct parisc_device_id processor_tbl[] __read_mostly = {
        { HPHW_NPROC, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, SVERSION_ANY_ID },
        { 0, }
 };
-static struct parisc_driver cpu_driver = {
+static struct parisc_driver cpu_driver __read_mostly = {
        .name           = "CPU",
        .id_table       = processor_tbl,
        .probe          = processor_probe
diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c
index 73e9c34b0948..4a36ec3f6ac1 100644
--- a/arch/parisc/kernel/setup.c
+++ b/arch/parisc/kernel/setup.c
@@ -46,15 +46,15 @@
 #include <asm/io.h>
 #include <asm/setup.h>
-char    command_line[COMMAND_LINE_SIZE];
+char    command_line[COMMAND_LINE_SIZE] __read_mostly;
 /* Intended for ccio/sba/cpu statistics under /proc/bus/{runway|gsc} */
-struct proc_dir_entry * proc_runway_root = NULL;
+struct proc_dir_entry * proc_runway_root __read_mostly = NULL;
-struct proc_dir_entry * proc_gsc_root = NULL;
+struct proc_dir_entry * proc_gsc_root __read_mostly = NULL;
-struct proc_dir_entry * proc_mckinley_root = NULL;
+struct proc_dir_entry * proc_mckinley_root __read_mostly = NULL;
 #if !defined(CONFIG_PA20) && (defined(CONFIG_IOMMU_CCIO) || defined(CONFIG_IOMMU_SBA))
-int parisc_bus_is_phys = 1;     /* Assume no IOMMU is present */
+int parisc_bus_is_phys __read_mostly = 1;       /* Assume no IOMMU is present */
 EXPORT_SYMBOL(parisc_bus_is_phys);
 #endif
diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c
index ce89da0f654d..17f23c26f1ca 100644
--- a/arch/parisc/kernel/smp.c
+++ b/arch/parisc/kernel/smp.c
@@ -39,7 +39,7 @@
 #include <asm/atomic.h>
 #include <asm/current.h>
 #include <asm/delay.h>
-#include <asm/pgalloc.h>        /* for flush_tlb_all() proto/macro */
+#include <asm/tlbflush.h>
 #include <asm/io.h>
 #include <asm/irq.h>            /* for CPU_IRQ_REGION and friends */
@@ -58,9 +58,9 @@ DEFINE_SPINLOCK(smp_lock);
 volatile struct task_struct *smp_init_current_idle_task;
-static volatile int cpu_now_booting = 0;        /* track which CPU is booting */
+static volatile int cpu_now_booting __read_mostly = 0;  /* track which CPU is booting */
-static int parisc_max_cpus = 1;
+static int parisc_max_cpus __read_mostly = 1;
 /* online cpus are ones that we've managed to bring up completely
 * possible cpus are all valid cpu 
@@ -71,8 +71,8 @@ static int parisc_max_cpus = 1;
 * empty in the beginning.
 */
-cpumask_t cpu_online_map = CPU_MASK_NONE;       /* Bitmap of online CPUs */
+cpumask_t cpu_online_map   __read_mostly = CPU_MASK_NONE;       /* Bitmap of online CPUs */
-cpumask_t cpu_possible_map = CPU_MASK_ALL;      /* Bitmap of Present CPUs */
+cpumask_t cpu_possible_map __read_mostly = CPU_MASK_ALL;        /* Bitmap of Present CPUs */
 EXPORT_SYMBOL(cpu_online_map);
 EXPORT_SYMBOL(cpu_possible_map);
@@ -406,12 +406,10 @@ EXPORT_SYMBOL(smp_call_function);
 * as we want to ensure all TLB's flushed before proceeding.
 */
-extern void flush_tlb_all_local(void);
 void
 smp_flush_tlb_all(void)
 {
-        on_each_cpu((void (*)(void *))flush_tlb_all_local, NULL, 1, 1);
+        on_each_cpu(flush_tlb_all_local, NULL, 1, 1);
 }
@@ -487,7 +485,7 @@ void __init smp_callin(void)
 #endif
        flush_cache_all_local(); /* start with known state */
-        flush_tlb_all_local();
+        flush_tlb_all_local(NULL);
        local_irq_enable();  /* Interrupts have been off until now */
diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c
index cded25680787..594930bc4bcf 100644
--- a/arch/parisc/kernel/time.c
+++ b/arch/parisc/kernel/time.c
@@ -36,8 +36,8 @@
 /* xtime and wall_jiffies keep wall-clock time */
 extern unsigned long wall_jiffies;
-static long clocktick;  /* timer cycles per tick */
+static long clocktick __read_mostly;    /* timer cycles per tick */
-static long halftick;
+static long halftick __read_mostly;
 #ifdef CONFIG_SMP
 extern void smp_do_timer(struct pt_regs *regs);
diff --git a/arch/parisc/kernel/topology.c b/arch/parisc/kernel/topology.c
index ac2a40681414..3ba040050e4c 100644
--- a/arch/parisc/kernel/topology.c
+++ b/arch/parisc/kernel/topology.c
@@ -20,8 +20,9 @@
 #include <linux/init.h>
 #include <linux/smp.h>
 #include <linux/cpu.h>
+#include <linux/cache.h>
-static struct cpu cpu_devices[NR_CPUS];
+static struct cpu cpu_devices[NR_CPUS] __read_mostly;
 static int __init topology_init(void)
 {
diff --git a/arch/parisc/kernel/unaligned.c b/arch/parisc/kernel/unaligned.c
index eaae8a021f9f..de0a1b21cb40 100644
--- a/arch/parisc/kernel/unaligned.c
+++ b/arch/parisc/kernel/unaligned.c
@@ -122,7 +122,7 @@
 #define ERR_NOTHANDLED  -1
 #define ERR_PAGEFAULT   -2
-int unaligned_enabled = 1;
+int unaligned_enabled __read_mostly = 1;
 void die_if_kernel (char *str, struct pt_regs *regs, long err);
diff --git a/arch/parisc/kernel/unwind.c b/arch/parisc/kernel/unwind.c
index db141108412e..cc1c1afc3187 100644
--- a/arch/parisc/kernel/unwind.c
+++ b/arch/parisc/kernel/unwind.c
@@ -35,7 +35,7 @@ static spinlock_t unwind_lock;
 * we can call unwind_init as early in the bootup process as 
 * possible (before the slab allocator is initialized)
 */
-static struct unwind_table kernel_unwind_table;
+static struct unwind_table kernel_unwind_table __read_mostly;
 static LIST_HEAD(unwind_tables);
 static inline const struct unwind_table_entry *
diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S
index e5fac3e08c7a..6d6436a6b624 100644
--- a/arch/parisc/kernel/vmlinux.lds.S
+++ b/arch/parisc/kernel/vmlinux.lds.S
@@ -68,7 +68,7 @@ SECTIONS
  RODATA
  /* writeable */
-  . = ALIGN(4096);              /* Make sure this is paged aligned so
+  . = ALIGN(4096);              /* Make sure this is page aligned so
                                   that we can properly leave these
                                   as writable */
  data_start = .;
@@ -105,6 +105,10 @@ SECTIONS
  . = ALIGN(16);
  .data.lock_aligned : { *(.data.lock_aligned) }
+  /* rarely changed data like cpu maps */
+  . = ALIGN(16);
+  .data.read_mostly : { *(.data.read_mostly) }
  _edata = .;                   /* End of data section */
  . = ALIGN(16384);             /* init_task */
@@ -194,14 +198,7 @@ SECTIONS
 #endif
        }
-  /* Stabs debugging sections.  */
+  STABS_DEBUG
-  .stab 0 : { *(.stab) }
-  .stabstr 0 : { *(.stabstr) }
-  .stab.excl 0 : { *(.stab.excl) }
-  .stab.exclstr 0 : { *(.stab.exclstr) }
-  .stab.index 0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment 0 : { *(.comment) }
  .note 0 : { *(.note) }        
 }
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 29b998e430e6..720287d46e55 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -36,9 +36,9 @@ extern char _end;	/* end of BSS, defined by linker */
 extern char __init_begin, __init_end;
 #ifdef CONFIG_DISCONTIGMEM
-struct node_map_data node_data[MAX_NUMNODES];
+struct node_map_data node_data[MAX_NUMNODES] __read_mostly;
-bootmem_data_t bmem_data[MAX_NUMNODES];
+bootmem_data_t bmem_data[MAX_NUMNODES] __read_mostly;
-unsigned char pfnnid_map[PFNNID_MAP_MAX];
+unsigned char pfnnid_map[PFNNID_MAP_MAX] __read_mostly;
 #endif
 static struct resource data_resource = {
@@ -58,14 +58,14 @@ static struct resource pdcdata_resource = {
        .flags  = IORESOURCE_BUSY | IORESOURCE_MEM,
 };
-static struct resource sysram_resources[MAX_PHYSMEM_RANGES];
+static struct resource sysram_resources[MAX_PHYSMEM_RANGES] __read_mostly;
 /* The following array is initialized from the firmware specific
 * information retrieved in kernel/inventory.c.
 */
-physmem_range_t pmem_ranges[MAX_PHYSMEM_RANGES];
+physmem_range_t pmem_ranges[MAX_PHYSMEM_RANGES] __read_mostly;
-int npmem_ranges;
+int npmem_ranges __read_mostly;
 #ifdef __LP64__
 #define MAX_MEM         (~0UL)
@@ -73,7 +73,7 @@ int npmem_ranges;
 #define MAX_MEM         (3584U*1024U*1024U)
 #endif /* !__LP64__ */
-static unsigned long mem_limit = MAX_MEM;
+static unsigned long mem_limit __read_mostly = MAX_MEM;
 static void __init mem_limit_func(void)
 {
@@ -300,6 +300,13 @@ static void __init setup_bootmem(void)
                        max_pfn = start_pfn + npages;
        }
+        /* IOMMU is always used to access "high mem" on those boxes
+         * that can support enough mem that a PCI device couldn't
+         * directly DMA to any physical addresses.
+         * ISA DMA support will need to revisit this.
+         */
+        max_low_pfn = max_pfn;
        if ((bootmap_pfn - bootmap_start_pfn) != bootmap_pages) {
                printk(KERN_WARNING "WARNING! bootmap sizing is messed up!\n");
                BUG();
@@ -431,11 +438,11 @@ void free_initmem(void)
 #define SET_MAP_OFFSET(x) ((void *)(((unsigned long)(x) + VM_MAP_OFFSET) \
                                     & ~(VM_MAP_OFFSET-1)))
-void *vmalloc_start;
+void *vmalloc_start __read_mostly;
 EXPORT_SYMBOL(vmalloc_start);
 #ifdef CONFIG_PA11
-unsigned long pcxl_dma_start;
+unsigned long pcxl_dma_start __read_mostly;
 #endif
 void __init mem_init(void)
@@ -475,7 +482,7 @@ int do_check_pgt_cache(int low, int high)
        return 0;
 }
-unsigned long *empty_zero_page;
+unsigned long *empty_zero_page __read_mostly;
 void show_mem(void)
 {
@@ -998,7 +1005,7 @@ void flush_tlb_all(void)
 void flush_tlb_all(void)
 {
        spin_lock(&sid_lock);
-        flush_tlb_all_local();
+        flush_tlb_all_local(NULL);
        recycle_sids();
        spin_unlock(&sid_lock);
 }
diff --git a/arch/parisc/mm/ioremap.c b/arch/parisc/mm/ioremap.c
index 5c7a1b3b9326..edd9a9559cba 100644
--- a/arch/parisc/mm/ioremap.c
+++ b/arch/parisc/mm/ioremap.c
@@ -1,12 +1,9 @@
 /*
 * arch/parisc/mm/ioremap.c
 *
- * Re-map IO memory to kernel address space so that we can access it.
- * This is needed for high PCI addresses that aren't mapped in the
- * 640k-1MB IO memory area on PC's
- *
 * (C) Copyright 1995 1996 Linus Torvalds
 * (C) Copyright 2001 Helge Deller <deller@gmx.de>
+ * (C) Copyright 2005 Kyle McMartin <kyle@parisc-linux.org>
 */
 #include <linux/vmalloc.h>
@@ -14,81 +11,107 @@
 #include <linux/module.h>
 #include <asm/io.h>
 #include <asm/pgalloc.h>
+#include <asm/tlbflush.h>
+#include <asm/cacheflush.h>
-static inline void remap_area_pte(pte_t * pte, unsigned long address, unsigned long size,
+static inline void 
-        unsigned long phys_addr, unsigned long flags)
+remap_area_pte(pte_t *pte, unsigned long address, unsigned long size,
+               unsigned long phys_addr, unsigned long flags)
 {
-        unsigned long end;
+        unsigned long end, pfn;
+        pgprot_t pgprot = __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY |
+                                   _PAGE_ACCESSED | flags);
        address &= ~PMD_MASK;
        end = address + size;
        if (end > PMD_SIZE)
                end = PMD_SIZE;
-        if (address >= end)
-                BUG();
+        BUG_ON(address >= end);
+        pfn = phys_addr >> PAGE_SHIFT;
        do {
-                if (!pte_none(*pte)) {
+                BUG_ON(!pte_none(*pte));
-                        printk(KERN_ERR "remap_area_pte: page already exists\n");
-                        BUG();
+                set_pte(pte, pfn_pte(pfn, pgprot));
-                }
-                set_pte(pte, mk_pte_phys(phys_addr, __pgprot(_PAGE_PRESENT | _PAGE_RW | 
-                                        _PAGE_DIRTY | _PAGE_ACCESSED | flags)));
                address += PAGE_SIZE;
-                phys_addr += PAGE_SIZE;
+                pfn++;
                pte++;
        } while (address && (address < end));
 }
-static inline int remap_area_pmd(pmd_t * pmd, unsigned long address, unsigned long size,
+static inline int 
-        unsigned long phys_addr, unsigned long flags)
+remap_area_pmd(pmd_t *pmd, unsigned long address, unsigned long size,
+               unsigned long phys_addr, unsigned long flags)
 {
        unsigned long end;
        address &= ~PGDIR_MASK;
        end = address + size;
        if (end > PGDIR_SIZE)
                end = PGDIR_SIZE;
+        BUG_ON(address >= end);
        phys_addr -= address;
-        if (address >= end)
-                BUG();
        do {
-                pte_t * pte = pte_alloc_kernel(pmd, address);
+                pte_t *pte = pte_alloc_kernel(pmd, address);
                if (!pte)
                        return -ENOMEM;
-                remap_area_pte(pte, address, end - address, address + phys_addr, flags);
+                remap_area_pte(pte, address, end - address, 
+                               address + phys_addr, flags);
                address = (address + PMD_SIZE) & PMD_MASK;
                pmd++;
        } while (address && (address < end));
        return 0;
 }
-#if (USE_HPPA_IOREMAP)
+#if USE_HPPA_IOREMAP
-static int remap_area_pages(unsigned long address, unsigned long phys_addr,
+static int 
-                                 unsigned long size, unsigned long flags)
+remap_area_pages(unsigned long address, unsigned long phys_addr,
+                 unsigned long size, unsigned long flags)
 {
-        int error;
+        pgd_t *dir;
-        pgd_t * dir;
+        int error = 0;
        unsigned long end = address + size;
+        BUG_ON(address >= end);
        phys_addr -= address;
-        dir = pgd_offset(&init_mm, address);
+        dir = pgd_offset_k(address);
        flush_cache_all();
-        if (address >= end)
-                BUG();
        do {
+                pud_t *pud;
                pmd_t *pmd;
-                pmd = pmd_alloc(&init_mm, dir, address);
                error = -ENOMEM;
+                pud = pud_alloc(&init_mm, dir, address);
+                if (!pud)
+                        break;
+                pmd = pmd_alloc(&init_mm, pud, address);
                if (!pmd)
                        break;
                if (remap_area_pmd(pmd, address, end - address,
-                                         phys_addr + address, flags))
+                                   phys_addr + address, flags))
                        break;
                error = 0;
                address = (address + PGDIR_SIZE) & PGDIR_MASK;
                dir++;
        } while (address && (address < end));
        flush_tlb_all();
        return error;
 }
 #endif /* USE_HPPA_IOREMAP */
@@ -123,8 +146,7 @@ EXPORT_SYMBOL(__raw_bad_addr);
 /*
 * Remap an arbitrary physical address space into the kernel virtual
- * address space. Needed when the kernel wants to access high addresses
+ * address space.
- * directly.
 *
 * NOTE! We need to allow non-page-aligned mappings too: we will obviously
 * have to convert them into an offset in a page-aligned mapping, but the
@@ -148,8 +170,8 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l
 #endif
 #else
-        void * addr;
+        void *addr;
-        struct vm_struct * area;
+        struct vm_struct *area;
        unsigned long offset, last_addr;
        /* Don't allow wraparound or zero size */
@@ -167,9 +189,11 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l
                t_addr = __va(phys_addr);
                t_end = t_addr + (size - 1);
           
-                for(page = virt_to_page(t_addr); page <= virt_to_page(t_end); page++)
+                for (page = virt_to_page(t_addr); 
+                     page <= virt_to_page(t_end); page++) {
                        if(!PageReserved(page))
                                return NULL;
+                }
        }
        /*
@@ -185,11 +209,13 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l
        area = get_vm_area(size, VM_IOREMAP);
        if (!area)
                return NULL;
        addr = area->addr;
        if (remap_area_pages((unsigned long) addr, phys_addr, size, flags)) {
                vfree(addr);
                return NULL;
        }
        return (void __iomem *) (offset + (char *)addr);
 #endif
 }