diff options
author | Helge Deller <deller@parisc-linux.org> | 2006-01-10 20:35:03 -0500 |
---|---|---|
committer | Kyle McMartin <kyle@duet.int.mcmartin.ca> | 2006-01-10 20:35:03 -0500 |
commit | 8039de10aae3cd4cf0ef0ccebd58aff0e8810df2 (patch) | |
tree | af82e045c8fb3a417f78b49ec43413995b5f3c0f /arch/parisc | |
parent | 02706647a49011ae1e7b4eca33e835d1681b094e (diff) |
[PARISC] Add __read_mostly section for parisc
Flag a whole bunch of things as __read_mostly on parisc. Also flag a few
branches as unlikely() and cleanup a bit of code.
Signed-off-by: Helge Deller <deller@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'arch/parisc')
-rw-r--r-- | arch/parisc/kernel/cache.c | 12 | ||||
-rw-r--r-- | arch/parisc/kernel/drivers.c | 2 | ||||
-rw-r--r-- | arch/parisc/kernel/firmware.c | 2 | ||||
-rw-r--r-- | arch/parisc/kernel/inventory.c | 6 | ||||
-rw-r--r-- | arch/parisc/kernel/pci-dma.c | 6 | ||||
-rw-r--r-- | arch/parisc/kernel/pdc_chassis.c | 13 | ||||
-rw-r--r-- | arch/parisc/kernel/perf.c | 6 | ||||
-rw-r--r-- | arch/parisc/kernel/process.c | 2 | ||||
-rw-r--r-- | arch/parisc/kernel/processor.c | 8 | ||||
-rw-r--r-- | arch/parisc/kernel/setup.c | 10 | ||||
-rw-r--r-- | arch/parisc/kernel/smp.c | 8 | ||||
-rw-r--r-- | arch/parisc/kernel/time.c | 4 | ||||
-rw-r--r-- | arch/parisc/kernel/topology.c | 3 | ||||
-rw-r--r-- | arch/parisc/kernel/unaligned.c | 2 | ||||
-rw-r--r-- | arch/parisc/kernel/unwind.c | 2 | ||||
-rw-r--r-- | arch/parisc/kernel/vmlinux.lds.S | 4 | ||||
-rw-r--r-- | arch/parisc/mm/init.c | 20 |
17 files changed, 58 insertions, 52 deletions
diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c index a065349aee37..63047c6d2d04 100644 --- a/arch/parisc/kernel/cache.c +++ b/arch/parisc/kernel/cache.c | |||
@@ -29,9 +29,9 @@ | |||
29 | #include <asm/processor.h> | 29 | #include <asm/processor.h> |
30 | #include <asm/sections.h> | 30 | #include <asm/sections.h> |
31 | 31 | ||
32 | int split_tlb; | 32 | int split_tlb __read_mostly; |
33 | int dcache_stride; | 33 | int dcache_stride __read_mostly; |
34 | int icache_stride; | 34 | int icache_stride __read_mostly; |
35 | EXPORT_SYMBOL(dcache_stride); | 35 | EXPORT_SYMBOL(dcache_stride); |
36 | 36 | ||
37 | 37 | ||
@@ -45,9 +45,9 @@ DEFINE_SPINLOCK(pa_tlb_lock); | |||
45 | EXPORT_SYMBOL(pa_tlb_lock); | 45 | EXPORT_SYMBOL(pa_tlb_lock); |
46 | #endif | 46 | #endif |
47 | 47 | ||
48 | struct pdc_cache_info cache_info; | 48 | struct pdc_cache_info cache_info __read_mostly; |
49 | #ifndef CONFIG_PA20 | 49 | #ifndef CONFIG_PA20 |
50 | static struct pdc_btlb_info btlb_info; | 50 | static struct pdc_btlb_info btlb_info __read_mostly; |
51 | #endif | 51 | #endif |
52 | 52 | ||
53 | #ifdef CONFIG_SMP | 53 | #ifdef CONFIG_SMP |
@@ -332,7 +332,7 @@ void clear_user_page_asm(void *page, unsigned long vaddr) | |||
332 | } | 332 | } |
333 | 333 | ||
334 | #define FLUSH_THRESHOLD 0x80000 /* 0.5MB */ | 334 | #define FLUSH_THRESHOLD 0x80000 /* 0.5MB */ |
335 | int parisc_cache_flush_threshold = FLUSH_THRESHOLD; | 335 | int parisc_cache_flush_threshold __read_mostly = FLUSH_THRESHOLD; |
336 | 336 | ||
337 | void parisc_setup_cache_timing(void) | 337 | void parisc_setup_cache_timing(void) |
338 | { | 338 | { |
diff --git a/arch/parisc/kernel/drivers.c b/arch/parisc/kernel/drivers.c index d016d672ec2b..041524d24ef1 100644 --- a/arch/parisc/kernel/drivers.c +++ b/arch/parisc/kernel/drivers.c | |||
@@ -39,7 +39,7 @@ | |||
39 | #include <asm/parisc-device.h> | 39 | #include <asm/parisc-device.h> |
40 | 40 | ||
41 | /* See comments in include/asm-parisc/pci.h */ | 41 | /* See comments in include/asm-parisc/pci.h */ |
42 | struct hppa_dma_ops *hppa_dma_ops; | 42 | struct hppa_dma_ops *hppa_dma_ops __read_mostly; |
43 | EXPORT_SYMBOL(hppa_dma_ops); | 43 | EXPORT_SYMBOL(hppa_dma_ops); |
44 | 44 | ||
45 | static struct device root = { | 45 | static struct device root = { |
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))); | |||
80 | 80 | ||
81 | /* Firmware needs to be initially set to narrow to determine the | 81 | /* Firmware needs to be initially set to narrow to determine the |
82 | * actual firmware width. */ | 82 | * actual firmware width. */ |
83 | int parisc_narrow_firmware = 1; | 83 | int parisc_narrow_firmware __read_mostly = 1; |
84 | #endif | 84 | #endif |
85 | 85 | ||
86 | /* On most currently-supported platforms, IODC I/O calls are 32-bit calls | 86 | /* On most currently-supported platforms, IODC I/O calls are 32-bit calls |
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 @@ | |||
38 | */ | 38 | */ |
39 | #undef DEBUG_PAT | 39 | #undef DEBUG_PAT |
40 | 40 | ||
41 | int pdc_type = PDC_TYPE_ILLEGAL; | 41 | int pdc_type __read_mostly = PDC_TYPE_ILLEGAL; |
42 | 42 | ||
43 | void __init setup_pdc(void) | 43 | void __init setup_pdc(void) |
44 | { | 44 | { |
@@ -120,8 +120,8 @@ set_pmem_entry(physmem_range_t *pmem_ptr, unsigned long start, | |||
120 | * pdc info is bad in this case). | 120 | * pdc info is bad in this case). |
121 | */ | 121 | */ |
122 | 122 | ||
123 | if ( ((start & (PAGE_SIZE - 1)) != 0) | 123 | if (unlikely( ((start & (PAGE_SIZE - 1)) != 0) |
124 | || ((pages4k & ((1UL << PDC_PAGE_ADJ_SHIFT) - 1)) != 0) ) { | 124 | || ((pages4k & ((1UL << PDC_PAGE_ADJ_SHIFT) - 1)) != 0) )) { |
125 | 125 | ||
126 | panic("Memory range doesn't align with page size!\n"); | 126 | panic("Memory range doesn't align with page size!\n"); |
127 | } | 127 | } |
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 @@ | |||
33 | #include <asm/uaccess.h> | 33 | #include <asm/uaccess.h> |
34 | #include <asm/tlbflush.h> /* for purge_tlb_*() macros */ | 34 | #include <asm/tlbflush.h> /* for purge_tlb_*() macros */ |
35 | 35 | ||
36 | static struct proc_dir_entry * proc_gsc_root = NULL; | 36 | static struct proc_dir_entry * proc_gsc_root __read_mostly = NULL; |
37 | static int pcxl_proc_info(char *buffer, char **start, off_t offset, int length); | 37 | static int pcxl_proc_info(char *buffer, char **start, off_t offset, int length); |
38 | static unsigned long pcxl_used_bytes = 0; | 38 | static unsigned long pcxl_used_bytes __read_mostly = 0; |
39 | static unsigned long pcxl_used_pages = 0; | 39 | static unsigned long pcxl_used_pages __read_mostly = 0; |
40 | 40 | ||
41 | extern unsigned long pcxl_dma_start; /* Start of pcxl dma mapping area */ | 41 | extern unsigned long pcxl_dma_start; /* Start of pcxl dma mapping area */ |
42 | static spinlock_t pcxl_res_lock; | 42 | 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 @@ | |||
30 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
31 | #include <linux/reboot.h> | 31 | #include <linux/reboot.h> |
32 | #include <linux/notifier.h> | 32 | #include <linux/notifier.h> |
33 | #include <linux/cache.h> | ||
33 | 34 | ||
34 | #include <asm/pdc_chassis.h> | 35 | #include <asm/pdc_chassis.h> |
35 | #include <asm/processor.h> | 36 | #include <asm/processor.h> |
@@ -38,8 +39,8 @@ | |||
38 | 39 | ||
39 | 40 | ||
40 | #ifdef CONFIG_PDC_CHASSIS | 41 | #ifdef CONFIG_PDC_CHASSIS |
41 | static int pdc_chassis_old = 0; | 42 | static int pdc_chassis_old __read_mostly = 0; |
42 | static unsigned int pdc_chassis_enabled = 1; | 43 | static unsigned int pdc_chassis_enabled __read_mostly = 1; |
43 | 44 | ||
44 | 45 | ||
45 | /** | 46 | /** |
@@ -132,7 +133,7 @@ void __init parisc_pdc_chassis_init(void) | |||
132 | { | 133 | { |
133 | #ifdef CONFIG_PDC_CHASSIS | 134 | #ifdef CONFIG_PDC_CHASSIS |
134 | int handle = 0; | 135 | int handle = 0; |
135 | if (pdc_chassis_enabled) { | 136 | if (likely(pdc_chassis_enabled)) { |
136 | DPRINTK(KERN_DEBUG "%s: parisc_pdc_chassis_init()\n", __FILE__); | 137 | DPRINTK(KERN_DEBUG "%s: parisc_pdc_chassis_init()\n", __FILE__); |
137 | 138 | ||
138 | /* Let see if we have something to handle... */ | 139 | /* Let see if we have something to handle... */ |
@@ -142,7 +143,7 @@ void __init parisc_pdc_chassis_init(void) | |||
142 | printk(KERN_INFO "Enabling PDC_PAT chassis codes support.\n"); | 143 | printk(KERN_INFO "Enabling PDC_PAT chassis codes support.\n"); |
143 | handle = 1; | 144 | handle = 1; |
144 | } | 145 | } |
145 | else if (pdc_chassis_old) { | 146 | else if (unlikely(pdc_chassis_old)) { |
146 | printk(KERN_INFO "Enabling old style chassis LED panel support.\n"); | 147 | printk(KERN_INFO "Enabling old style chassis LED panel support.\n"); |
147 | handle = 1; | 148 | handle = 1; |
148 | } | 149 | } |
@@ -178,7 +179,7 @@ int pdc_chassis_send_status(int message) | |||
178 | /* Maybe we should do that in an other way ? */ | 179 | /* Maybe we should do that in an other way ? */ |
179 | int retval = 0; | 180 | int retval = 0; |
180 | #ifdef CONFIG_PDC_CHASSIS | 181 | #ifdef CONFIG_PDC_CHASSIS |
181 | if (pdc_chassis_enabled) { | 182 | if (likely(pdc_chassis_enabled)) { |
182 | 183 | ||
183 | DPRINTK(KERN_DEBUG "%s: pdc_chassis_send_status(%d)\n", __FILE__, message); | 184 | DPRINTK(KERN_DEBUG "%s: pdc_chassis_send_status(%d)\n", __FILE__, message); |
184 | 185 | ||
@@ -214,7 +215,7 @@ int pdc_chassis_send_status(int message) | |||
214 | } | 215 | } |
215 | } else retval = -1; | 216 | } else retval = -1; |
216 | #else | 217 | #else |
217 | if (pdc_chassis_old) { | 218 | if (unlikely(pdc_chassis_old)) { |
218 | switch (message) { | 219 | switch (message) { |
219 | case PDC_CHASSIS_DIRECT_BSTART: | 220 | case PDC_CHASSIS_DIRECT_BSTART: |
220 | case PDC_CHASSIS_DIRECT_BCOMPLETE: | 221 | 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 { | |||
66 | uint8_t write_control; | 66 | uint8_t write_control; |
67 | }; | 67 | }; |
68 | 68 | ||
69 | static int perf_processor_interface = UNKNOWN_INTF; | 69 | static int perf_processor_interface __read_mostly = UNKNOWN_INTF; |
70 | static int perf_enabled = 0; | 70 | static int perf_enabled __read_mostly = 0; |
71 | static spinlock_t perf_lock; | 71 | static spinlock_t perf_lock; |
72 | struct parisc_device *cpu_device = NULL; | 72 | struct parisc_device *cpu_device __read_mostly = NULL; |
73 | 73 | ||
74 | /* RDRs to write for PCX-W */ | 74 | /* RDRs to write for PCX-W */ |
75 | static int perf_rdrs_W[] = | 75 | 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 @@ | |||
54 | #include <asm/uaccess.h> | 54 | #include <asm/uaccess.h> |
55 | #include <asm/unwind.h> | 55 | #include <asm/unwind.h> |
56 | 56 | ||
57 | static int hlt_counter; | 57 | static int hlt_counter __read_mostly; |
58 | 58 | ||
59 | /* | 59 | /* |
60 | * Power off function, if any | 60 | * 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 @@ | |||
44 | #include <asm/irq.h> /* for struct irq_region */ | 44 | #include <asm/irq.h> /* for struct irq_region */ |
45 | #include <asm/parisc-device.h> | 45 | #include <asm/parisc-device.h> |
46 | 46 | ||
47 | struct system_cpuinfo_parisc boot_cpu_data; | 47 | struct system_cpuinfo_parisc boot_cpu_data __read_mostly; |
48 | EXPORT_SYMBOL(boot_cpu_data); | 48 | EXPORT_SYMBOL(boot_cpu_data); |
49 | 49 | ||
50 | struct cpuinfo_parisc cpu_data[NR_CPUS]; | 50 | struct cpuinfo_parisc cpu_data[NR_CPUS] __read_mostly; |
51 | 51 | ||
52 | /* | 52 | /* |
53 | ** PARISC CPU driver - claim "device" and initialize CPU data structures. | 53 | ** PARISC CPU driver - claim "device" and initialize CPU data structures. |
@@ -378,12 +378,12 @@ show_cpuinfo (struct seq_file *m, void *v) | |||
378 | return 0; | 378 | return 0; |
379 | } | 379 | } |
380 | 380 | ||
381 | static struct parisc_device_id processor_tbl[] = { | 381 | static struct parisc_device_id processor_tbl[] __read_mostly = { |
382 | { HPHW_NPROC, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, SVERSION_ANY_ID }, | 382 | { HPHW_NPROC, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, SVERSION_ANY_ID }, |
383 | { 0, } | 383 | { 0, } |
384 | }; | 384 | }; |
385 | 385 | ||
386 | static struct parisc_driver cpu_driver = { | 386 | static struct parisc_driver cpu_driver __read_mostly = { |
387 | .name = "CPU", | 387 | .name = "CPU", |
388 | .id_table = processor_tbl, | 388 | .id_table = processor_tbl, |
389 | .probe = processor_probe | 389 | .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 @@ | |||
46 | #include <asm/io.h> | 46 | #include <asm/io.h> |
47 | #include <asm/setup.h> | 47 | #include <asm/setup.h> |
48 | 48 | ||
49 | char command_line[COMMAND_LINE_SIZE]; | 49 | char command_line[COMMAND_LINE_SIZE] __read_mostly; |
50 | 50 | ||
51 | /* Intended for ccio/sba/cpu statistics under /proc/bus/{runway|gsc} */ | 51 | /* Intended for ccio/sba/cpu statistics under /proc/bus/{runway|gsc} */ |
52 | struct proc_dir_entry * proc_runway_root = NULL; | 52 | struct proc_dir_entry * proc_runway_root __read_mostly = NULL; |
53 | struct proc_dir_entry * proc_gsc_root = NULL; | 53 | struct proc_dir_entry * proc_gsc_root __read_mostly = NULL; |
54 | struct proc_dir_entry * proc_mckinley_root = NULL; | 54 | struct proc_dir_entry * proc_mckinley_root __read_mostly = NULL; |
55 | 55 | ||
56 | #if !defined(CONFIG_PA20) && (defined(CONFIG_IOMMU_CCIO) || defined(CONFIG_IOMMU_SBA)) | 56 | #if !defined(CONFIG_PA20) && (defined(CONFIG_IOMMU_CCIO) || defined(CONFIG_IOMMU_SBA)) |
57 | int parisc_bus_is_phys = 1; /* Assume no IOMMU is present */ | 57 | int parisc_bus_is_phys __read_mostly = 1; /* Assume no IOMMU is present */ |
58 | EXPORT_SYMBOL(parisc_bus_is_phys); | 58 | EXPORT_SYMBOL(parisc_bus_is_phys); |
59 | #endif | 59 | #endif |
60 | 60 | ||
diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c index ce89da0f654d..fb3ca84f1b97 100644 --- a/arch/parisc/kernel/smp.c +++ b/arch/parisc/kernel/smp.c | |||
@@ -58,9 +58,9 @@ DEFINE_SPINLOCK(smp_lock); | |||
58 | 58 | ||
59 | volatile struct task_struct *smp_init_current_idle_task; | 59 | volatile struct task_struct *smp_init_current_idle_task; |
60 | 60 | ||
61 | static volatile int cpu_now_booting = 0; /* track which CPU is booting */ | 61 | static volatile int cpu_now_booting __read_mostly = 0; /* track which CPU is booting */ |
62 | 62 | ||
63 | static int parisc_max_cpus = 1; | 63 | static int parisc_max_cpus __read_mostly = 1; |
64 | 64 | ||
65 | /* online cpus are ones that we've managed to bring up completely | 65 | /* online cpus are ones that we've managed to bring up completely |
66 | * possible cpus are all valid cpu | 66 | * possible cpus are all valid cpu |
@@ -71,8 +71,8 @@ static int parisc_max_cpus = 1; | |||
71 | * empty in the beginning. | 71 | * empty in the beginning. |
72 | */ | 72 | */ |
73 | 73 | ||
74 | cpumask_t cpu_online_map = CPU_MASK_NONE; /* Bitmap of online CPUs */ | 74 | cpumask_t cpu_online_map __read_mostly = CPU_MASK_NONE; /* Bitmap of online CPUs */ |
75 | cpumask_t cpu_possible_map = CPU_MASK_ALL; /* Bitmap of Present CPUs */ | 75 | cpumask_t cpu_possible_map __read_mostly = CPU_MASK_ALL; /* Bitmap of Present CPUs */ |
76 | 76 | ||
77 | EXPORT_SYMBOL(cpu_online_map); | 77 | EXPORT_SYMBOL(cpu_online_map); |
78 | EXPORT_SYMBOL(cpu_possible_map); | 78 | EXPORT_SYMBOL(cpu_possible_map); |
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 @@ | |||
36 | /* xtime and wall_jiffies keep wall-clock time */ | 36 | /* xtime and wall_jiffies keep wall-clock time */ |
37 | extern unsigned long wall_jiffies; | 37 | extern unsigned long wall_jiffies; |
38 | 38 | ||
39 | static long clocktick; /* timer cycles per tick */ | 39 | static long clocktick __read_mostly; /* timer cycles per tick */ |
40 | static long halftick; | 40 | static long halftick __read_mostly; |
41 | 41 | ||
42 | #ifdef CONFIG_SMP | 42 | #ifdef CONFIG_SMP |
43 | extern void smp_do_timer(struct pt_regs *regs); | 43 | 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 @@ | |||
20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
21 | #include <linux/smp.h> | 21 | #include <linux/smp.h> |
22 | #include <linux/cpu.h> | 22 | #include <linux/cpu.h> |
23 | #include <linux/cache.h> | ||
23 | 24 | ||
24 | static struct cpu cpu_devices[NR_CPUS]; | 25 | static struct cpu cpu_devices[NR_CPUS] __read_mostly; |
25 | 26 | ||
26 | static int __init topology_init(void) | 27 | static int __init topology_init(void) |
27 | { | 28 | { |
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 @@ | |||
122 | #define ERR_NOTHANDLED -1 | 122 | #define ERR_NOTHANDLED -1 |
123 | #define ERR_PAGEFAULT -2 | 123 | #define ERR_PAGEFAULT -2 |
124 | 124 | ||
125 | int unaligned_enabled = 1; | 125 | int unaligned_enabled __read_mostly = 1; |
126 | 126 | ||
127 | void die_if_kernel (char *str, struct pt_regs *regs, long err); | 127 | void die_if_kernel (char *str, struct pt_regs *regs, long err); |
128 | 128 | ||
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; | |||
35 | * we can call unwind_init as early in the bootup process as | 35 | * we can call unwind_init as early in the bootup process as |
36 | * possible (before the slab allocator is initialized) | 36 | * possible (before the slab allocator is initialized) |
37 | */ | 37 | */ |
38 | static struct unwind_table kernel_unwind_table; | 38 | static struct unwind_table kernel_unwind_table __read_mostly; |
39 | static LIST_HEAD(unwind_tables); | 39 | static LIST_HEAD(unwind_tables); |
40 | 40 | ||
41 | static inline const struct unwind_table_entry * | 41 | 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..b8b9174f6425 100644 --- a/arch/parisc/kernel/vmlinux.lds.S +++ b/arch/parisc/kernel/vmlinux.lds.S | |||
@@ -105,6 +105,10 @@ SECTIONS | |||
105 | . = ALIGN(16); | 105 | . = ALIGN(16); |
106 | .data.lock_aligned : { *(.data.lock_aligned) } | 106 | .data.lock_aligned : { *(.data.lock_aligned) } |
107 | 107 | ||
108 | /* rarely changed data like cpu maps */ | ||
109 | . = ALIGN(16); | ||
110 | .data.read_mostly : { *(.data.read_mostly) } | ||
111 | |||
108 | _edata = .; /* End of data section */ | 112 | _edata = .; /* End of data section */ |
109 | 113 | ||
110 | . = ALIGN(16384); /* init_task */ | 114 | . = ALIGN(16384); /* init_task */ |
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c index 29b998e430e6..a992cb8cfe61 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 */ | |||
36 | extern char __init_begin, __init_end; | 36 | extern char __init_begin, __init_end; |
37 | 37 | ||
38 | #ifdef CONFIG_DISCONTIGMEM | 38 | #ifdef CONFIG_DISCONTIGMEM |
39 | struct node_map_data node_data[MAX_NUMNODES]; | 39 | struct node_map_data node_data[MAX_NUMNODES] __read_mostly; |
40 | bootmem_data_t bmem_data[MAX_NUMNODES]; | 40 | bootmem_data_t bmem_data[MAX_NUMNODES] __read_mostly; |
41 | unsigned char pfnnid_map[PFNNID_MAP_MAX]; | 41 | unsigned char pfnnid_map[PFNNID_MAP_MAX] __read_mostly; |
42 | #endif | 42 | #endif |
43 | 43 | ||
44 | static struct resource data_resource = { | 44 | static struct resource data_resource = { |
@@ -58,14 +58,14 @@ static struct resource pdcdata_resource = { | |||
58 | .flags = IORESOURCE_BUSY | IORESOURCE_MEM, | 58 | .flags = IORESOURCE_BUSY | IORESOURCE_MEM, |
59 | }; | 59 | }; |
60 | 60 | ||
61 | static struct resource sysram_resources[MAX_PHYSMEM_RANGES]; | 61 | static struct resource sysram_resources[MAX_PHYSMEM_RANGES] __read_mostly; |
62 | 62 | ||
63 | /* The following array is initialized from the firmware specific | 63 | /* The following array is initialized from the firmware specific |
64 | * information retrieved in kernel/inventory.c. | 64 | * information retrieved in kernel/inventory.c. |
65 | */ | 65 | */ |
66 | 66 | ||
67 | physmem_range_t pmem_ranges[MAX_PHYSMEM_RANGES]; | 67 | physmem_range_t pmem_ranges[MAX_PHYSMEM_RANGES] __read_mostly; |
68 | int npmem_ranges; | 68 | int npmem_ranges __read_mostly; |
69 | 69 | ||
70 | #ifdef __LP64__ | 70 | #ifdef __LP64__ |
71 | #define MAX_MEM (~0UL) | 71 | #define MAX_MEM (~0UL) |
@@ -73,7 +73,7 @@ int npmem_ranges; | |||
73 | #define MAX_MEM (3584U*1024U*1024U) | 73 | #define MAX_MEM (3584U*1024U*1024U) |
74 | #endif /* !__LP64__ */ | 74 | #endif /* !__LP64__ */ |
75 | 75 | ||
76 | static unsigned long mem_limit = MAX_MEM; | 76 | static unsigned long mem_limit __read_mostly = MAX_MEM; |
77 | 77 | ||
78 | static void __init mem_limit_func(void) | 78 | static void __init mem_limit_func(void) |
79 | { | 79 | { |
@@ -431,11 +431,11 @@ void free_initmem(void) | |||
431 | #define SET_MAP_OFFSET(x) ((void *)(((unsigned long)(x) + VM_MAP_OFFSET) \ | 431 | #define SET_MAP_OFFSET(x) ((void *)(((unsigned long)(x) + VM_MAP_OFFSET) \ |
432 | & ~(VM_MAP_OFFSET-1))) | 432 | & ~(VM_MAP_OFFSET-1))) |
433 | 433 | ||
434 | void *vmalloc_start; | 434 | void *vmalloc_start __read_mostly; |
435 | EXPORT_SYMBOL(vmalloc_start); | 435 | EXPORT_SYMBOL(vmalloc_start); |
436 | 436 | ||
437 | #ifdef CONFIG_PA11 | 437 | #ifdef CONFIG_PA11 |
438 | unsigned long pcxl_dma_start; | 438 | unsigned long pcxl_dma_start __read_mostly; |
439 | #endif | 439 | #endif |
440 | 440 | ||
441 | void __init mem_init(void) | 441 | void __init mem_init(void) |
@@ -475,7 +475,7 @@ int do_check_pgt_cache(int low, int high) | |||
475 | return 0; | 475 | return 0; |
476 | } | 476 | } |
477 | 477 | ||
478 | unsigned long *empty_zero_page; | 478 | unsigned long *empty_zero_page __read_mostly; |
479 | 479 | ||
480 | void show_mem(void) | 480 | void show_mem(void) |
481 | { | 481 | { |