diff options
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/include/asm/acpi.h | 2 | ||||
-rw-r--r-- | arch/ia64/include/asm/iosapic.h | 11 | ||||
-rw-r--r-- | arch/ia64/include/asm/parport.h | 5 | ||||
-rw-r--r-- | arch/ia64/include/asm/smp.h | 2 | ||||
-rw-r--r-- | arch/ia64/kernel/acpi.c | 6 | ||||
-rw-r--r-- | arch/ia64/kernel/iosapic.c | 19 | ||||
-rw-r--r-- | arch/ia64/kernel/smpboot.c | 11 | ||||
-rw-r--r-- | arch/ia64/kernel/time.c | 3 | ||||
-rw-r--r-- | arch/ia64/mm/init.c | 5 | ||||
-rw-r--r-- | arch/ia64/mm/tlb.c | 3 | ||||
-rw-r--r-- | arch/ia64/pci/fixup.c | 2 | ||||
-rw-r--r-- | arch/ia64/pci/pci.c | 31 | ||||
-rw-r--r-- | arch/ia64/sn/kernel/io_common.c | 3 | ||||
-rw-r--r-- | arch/ia64/sn/kernel/sn2/sn_hwperf.c | 2 | ||||
-rw-r--r-- | arch/ia64/xen/irq_xen.c | 5 |
15 files changed, 42 insertions, 68 deletions
diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h index 301609c3fcec..359e68a03ca3 100644 --- a/arch/ia64/include/asm/acpi.h +++ b/arch/ia64/include/asm/acpi.h | |||
@@ -153,7 +153,7 @@ extern int additional_cpus; | |||
153 | #else | 153 | #else |
154 | #define MAX_PXM_DOMAINS (256) | 154 | #define MAX_PXM_DOMAINS (256) |
155 | #endif | 155 | #endif |
156 | extern int __devinitdata pxm_to_nid_map[MAX_PXM_DOMAINS]; | 156 | extern int pxm_to_nid_map[MAX_PXM_DOMAINS]; |
157 | extern int __initdata nid_to_pxm_map[MAX_NUMNODES]; | 157 | extern int __initdata nid_to_pxm_map[MAX_NUMNODES]; |
158 | #endif | 158 | #endif |
159 | 159 | ||
diff --git a/arch/ia64/include/asm/iosapic.h b/arch/ia64/include/asm/iosapic.h index b9c102e15f22..94c89a2d97fe 100644 --- a/arch/ia64/include/asm/iosapic.h +++ b/arch/ia64/include/asm/iosapic.h | |||
@@ -87,18 +87,13 @@ static inline void iosapic_eoi(char __iomem *iosapic, u32 vector) | |||
87 | } | 87 | } |
88 | 88 | ||
89 | extern void __init iosapic_system_init (int pcat_compat); | 89 | extern void __init iosapic_system_init (int pcat_compat); |
90 | extern int __devinit iosapic_init (unsigned long address, | 90 | extern int iosapic_init (unsigned long address, unsigned int gsi_base); |
91 | unsigned int gsi_base); | ||
92 | #ifdef CONFIG_HOTPLUG | ||
93 | extern int iosapic_remove (unsigned int gsi_base); | 91 | extern int iosapic_remove (unsigned int gsi_base); |
94 | #else | ||
95 | #define iosapic_remove(gsi_base) (-EINVAL) | ||
96 | #endif /* CONFIG_HOTPLUG */ | ||
97 | extern int gsi_to_irq (unsigned int gsi); | 92 | extern int gsi_to_irq (unsigned int gsi); |
98 | extern int iosapic_register_intr (unsigned int gsi, unsigned long polarity, | 93 | extern int iosapic_register_intr (unsigned int gsi, unsigned long polarity, |
99 | unsigned long trigger); | 94 | unsigned long trigger); |
100 | extern void iosapic_unregister_intr (unsigned int irq); | 95 | extern void iosapic_unregister_intr (unsigned int irq); |
101 | extern void __devinit iosapic_override_isa_irq (unsigned int isa_irq, unsigned int gsi, | 96 | extern void iosapic_override_isa_irq (unsigned int isa_irq, unsigned int gsi, |
102 | unsigned long polarity, | 97 | unsigned long polarity, |
103 | unsigned long trigger); | 98 | unsigned long trigger); |
104 | extern int __init iosapic_register_platform_intr (u32 int_type, | 99 | extern int __init iosapic_register_platform_intr (u32 int_type, |
@@ -109,7 +104,7 @@ extern int __init iosapic_register_platform_intr (u32 int_type, | |||
109 | unsigned long trigger); | 104 | unsigned long trigger); |
110 | 105 | ||
111 | #ifdef CONFIG_NUMA | 106 | #ifdef CONFIG_NUMA |
112 | extern void __devinit map_iosapic_to_node (unsigned int, int); | 107 | extern void map_iosapic_to_node (unsigned int, int); |
113 | #endif | 108 | #endif |
114 | #else | 109 | #else |
115 | #define iosapic_system_init(pcat_compat) do { } while (0) | 110 | #define iosapic_system_init(pcat_compat) do { } while (0) |
diff --git a/arch/ia64/include/asm/parport.h b/arch/ia64/include/asm/parport.h index 67e16adfcd25..638b4d271b99 100644 --- a/arch/ia64/include/asm/parport.h +++ b/arch/ia64/include/asm/parport.h | |||
@@ -9,10 +9,9 @@ | |||
9 | #ifndef _ASM_IA64_PARPORT_H | 9 | #ifndef _ASM_IA64_PARPORT_H |
10 | #define _ASM_IA64_PARPORT_H 1 | 10 | #define _ASM_IA64_PARPORT_H 1 |
11 | 11 | ||
12 | static int __devinit parport_pc_find_isa_ports (int autoirq, int autodma); | 12 | static int parport_pc_find_isa_ports(int autoirq, int autodma); |
13 | 13 | ||
14 | static int __devinit | 14 | static int parport_pc_find_nonpci_ports(int autoirq, int autodma) |
15 | parport_pc_find_nonpci_ports (int autoirq, int autodma) | ||
16 | { | 15 | { |
17 | return parport_pc_find_isa_ports(autoirq, autodma); | 16 | return parport_pc_find_isa_ports(autoirq, autodma); |
18 | } | 17 | } |
diff --git a/arch/ia64/include/asm/smp.h b/arch/ia64/include/asm/smp.h index 0b3b3997decd..fea21e986022 100644 --- a/arch/ia64/include/asm/smp.h +++ b/arch/ia64/include/asm/smp.h | |||
@@ -55,7 +55,7 @@ extern struct smp_boot_data { | |||
55 | int cpu_phys_id[NR_CPUS]; | 55 | int cpu_phys_id[NR_CPUS]; |
56 | } smp_boot_data __initdata; | 56 | } smp_boot_data __initdata; |
57 | 57 | ||
58 | extern char no_int_routing __devinitdata; | 58 | extern char no_int_routing; |
59 | 59 | ||
60 | extern cpumask_t cpu_core_map[NR_CPUS]; | 60 | extern cpumask_t cpu_core_map[NR_CPUS]; |
61 | DECLARE_PER_CPU_SHARED_ALIGNED(cpumask_t, cpu_sibling_map); | 61 | DECLARE_PER_CPU_SHARED_ALIGNED(cpumask_t, cpu_sibling_map); |
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index e9682f5be343..335eb07480fe 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c | |||
@@ -422,7 +422,7 @@ static int __init acpi_parse_madt(struct acpi_table_header *table) | |||
422 | #define PXM_FLAG_LEN ((MAX_PXM_DOMAINS + 1)/32) | 422 | #define PXM_FLAG_LEN ((MAX_PXM_DOMAINS + 1)/32) |
423 | 423 | ||
424 | static int __initdata srat_num_cpus; /* number of cpus */ | 424 | static int __initdata srat_num_cpus; /* number of cpus */ |
425 | static u32 __devinitdata pxm_flag[PXM_FLAG_LEN]; | 425 | static u32 pxm_flag[PXM_FLAG_LEN]; |
426 | #define pxm_bit_set(bit) (set_bit(bit,(void *)pxm_flag)) | 426 | #define pxm_bit_set(bit) (set_bit(bit,(void *)pxm_flag)) |
427 | #define pxm_bit_test(bit) (test_bit(bit,(void *)pxm_flag)) | 427 | #define pxm_bit_test(bit) (test_bit(bit,(void *)pxm_flag)) |
428 | static struct acpi_table_slit __initdata *slit_table; | 428 | static struct acpi_table_slit __initdata *slit_table; |
@@ -956,8 +956,8 @@ EXPORT_SYMBOL(acpi_unmap_lsapic); | |||
956 | #endif /* CONFIG_ACPI_HOTPLUG_CPU */ | 956 | #endif /* CONFIG_ACPI_HOTPLUG_CPU */ |
957 | 957 | ||
958 | #ifdef CONFIG_ACPI_NUMA | 958 | #ifdef CONFIG_ACPI_NUMA |
959 | static acpi_status __devinit | 959 | static acpi_status acpi_map_iosapic(acpi_handle handle, u32 depth, |
960 | acpi_map_iosapic(acpi_handle handle, u32 depth, void *context, void **ret) | 960 | void *context, void **ret) |
961 | { | 961 | { |
962 | struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; | 962 | struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; |
963 | union acpi_object *obj; | 963 | union acpi_object *obj; |
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c index ef4b5d877cf2..ee33c3aaa2fc 100644 --- a/arch/ia64/kernel/iosapic.c +++ b/arch/ia64/kernel/iosapic.c | |||
@@ -147,7 +147,7 @@ static struct iosapic_intr_info { | |||
147 | unsigned char trigger : 1; /* trigger mode (see iosapic.h) */ | 147 | unsigned char trigger : 1; /* trigger mode (see iosapic.h) */ |
148 | } iosapic_intr_info[NR_IRQS]; | 148 | } iosapic_intr_info[NR_IRQS]; |
149 | 149 | ||
150 | static unsigned char pcat_compat __devinitdata; /* 8259 compatibility flag */ | 150 | static unsigned char pcat_compat; /* 8259 compatibility flag */ |
151 | 151 | ||
152 | static inline void | 152 | static inline void |
153 | iosapic_write(struct iosapic *iosapic, unsigned int reg, u32 val) | 153 | iosapic_write(struct iosapic *iosapic, unsigned int reg, u32 val) |
@@ -914,10 +914,8 @@ iosapic_register_platform_intr (u32 int_type, unsigned int gsi, | |||
914 | /* | 914 | /* |
915 | * ACPI calls this when it finds an entry for a legacy ISA IRQ override. | 915 | * ACPI calls this when it finds an entry for a legacy ISA IRQ override. |
916 | */ | 916 | */ |
917 | void __devinit | 917 | void iosapic_override_isa_irq(unsigned int isa_irq, unsigned int gsi, |
918 | iosapic_override_isa_irq (unsigned int isa_irq, unsigned int gsi, | 918 | unsigned long polarity, unsigned long trigger) |
919 | unsigned long polarity, | ||
920 | unsigned long trigger) | ||
921 | { | 919 | { |
922 | int vector, irq; | 920 | int vector, irq; |
923 | unsigned int dest = cpu_physical_id(smp_processor_id()); | 921 | unsigned int dest = cpu_physical_id(smp_processor_id()); |
@@ -1012,8 +1010,7 @@ iosapic_check_gsi_range (unsigned int gsi_base, unsigned int ver) | |||
1012 | return 0; | 1010 | return 0; |
1013 | } | 1011 | } |
1014 | 1012 | ||
1015 | int __devinit | 1013 | int iosapic_init(unsigned long phys_addr, unsigned int gsi_base) |
1016 | iosapic_init (unsigned long phys_addr, unsigned int gsi_base) | ||
1017 | { | 1014 | { |
1018 | int num_rte, err, index; | 1015 | int num_rte, err, index; |
1019 | unsigned int isa_irq, ver; | 1016 | unsigned int isa_irq, ver; |
@@ -1070,9 +1067,7 @@ iosapic_init (unsigned long phys_addr, unsigned int gsi_base) | |||
1070 | return 0; | 1067 | return 0; |
1071 | } | 1068 | } |
1072 | 1069 | ||
1073 | #ifdef CONFIG_HOTPLUG | 1070 | int iosapic_remove(unsigned int gsi_base) |
1074 | int | ||
1075 | iosapic_remove (unsigned int gsi_base) | ||
1076 | { | 1071 | { |
1077 | int index, err = 0; | 1072 | int index, err = 0; |
1078 | unsigned long flags; | 1073 | unsigned long flags; |
@@ -1098,11 +1093,9 @@ iosapic_remove (unsigned int gsi_base) | |||
1098 | spin_unlock_irqrestore(&iosapic_lock, flags); | 1093 | spin_unlock_irqrestore(&iosapic_lock, flags); |
1099 | return err; | 1094 | return err; |
1100 | } | 1095 | } |
1101 | #endif /* CONFIG_HOTPLUG */ | ||
1102 | 1096 | ||
1103 | #ifdef CONFIG_NUMA | 1097 | #ifdef CONFIG_NUMA |
1104 | void __devinit | 1098 | void map_iosapic_to_node(unsigned int gsi_base, int node) |
1105 | map_iosapic_to_node(unsigned int gsi_base, int node) | ||
1106 | { | 1099 | { |
1107 | int index; | 1100 | int index; |
1108 | 1101 | ||
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c index 6a368cb2043e..500f1e4d9f9d 100644 --- a/arch/ia64/kernel/smpboot.c +++ b/arch/ia64/kernel/smpboot.c | |||
@@ -347,8 +347,7 @@ ia64_sync_itc (unsigned int master) | |||
347 | /* | 347 | /* |
348 | * Ideally sets up per-cpu profiling hooks. Doesn't do much now... | 348 | * Ideally sets up per-cpu profiling hooks. Doesn't do much now... |
349 | */ | 349 | */ |
350 | static inline void __devinit | 350 | static inline void smp_setup_percpu_timer(void) |
351 | smp_setup_percpu_timer (void) | ||
352 | { | 351 | { |
353 | } | 352 | } |
354 | 353 | ||
@@ -563,7 +562,7 @@ smp_prepare_cpus (unsigned int max_cpus) | |||
563 | } | 562 | } |
564 | } | 563 | } |
565 | 564 | ||
566 | void __devinit smp_prepare_boot_cpu(void) | 565 | void smp_prepare_boot_cpu(void) |
567 | { | 566 | { |
568 | set_cpu_online(smp_processor_id(), true); | 567 | set_cpu_online(smp_processor_id(), true); |
569 | cpu_set(smp_processor_id(), cpu_callin_map); | 568 | cpu_set(smp_processor_id(), cpu_callin_map); |
@@ -713,8 +712,7 @@ smp_cpus_done (unsigned int dummy) | |||
713 | (int)num_online_cpus(), bogosum/(500000/HZ), (bogosum/(5000/HZ))%100); | 712 | (int)num_online_cpus(), bogosum/(500000/HZ), (bogosum/(5000/HZ))%100); |
714 | } | 713 | } |
715 | 714 | ||
716 | static inline void __devinit | 715 | static inline void set_cpu_sibling_map(int cpu) |
717 | set_cpu_sibling_map(int cpu) | ||
718 | { | 716 | { |
719 | int i; | 717 | int i; |
720 | 718 | ||
@@ -793,8 +791,7 @@ init_smp_config(void) | |||
793 | * identify_siblings(cpu) gets called from identify_cpu. This populates the | 791 | * identify_siblings(cpu) gets called from identify_cpu. This populates the |
794 | * information related to logical execution units in per_cpu_data structure. | 792 | * information related to logical execution units in per_cpu_data structure. |
795 | */ | 793 | */ |
796 | void __devinit | 794 | void identify_siblings(struct cpuinfo_ia64 *c) |
797 | identify_siblings(struct cpuinfo_ia64 *c) | ||
798 | { | 795 | { |
799 | long status; | 796 | long status; |
800 | u16 pltid; | 797 | u16 pltid; |
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c index b1995efbfd21..88a794536bc0 100644 --- a/arch/ia64/kernel/time.c +++ b/arch/ia64/kernel/time.c | |||
@@ -243,8 +243,7 @@ static int __init nojitter_setup(char *str) | |||
243 | __setup("nojitter", nojitter_setup); | 243 | __setup("nojitter", nojitter_setup); |
244 | 244 | ||
245 | 245 | ||
246 | void __devinit | 246 | void ia64_init_itm(void) |
247 | ia64_init_itm (void) | ||
248 | { | 247 | { |
249 | unsigned long platform_base_freq, itc_freq; | 248 | unsigned long platform_base_freq, itc_freq; |
250 | struct pal_freq_ratio itc_ratio, proc_ratio; | 249 | struct pal_freq_ratio itc_ratio, proc_ratio; |
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index 082e383c1b6f..b755ea92aea7 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c | |||
@@ -294,11 +294,10 @@ setup_gate (void) | |||
294 | ia64_patch_gate(); | 294 | ia64_patch_gate(); |
295 | } | 295 | } |
296 | 296 | ||
297 | void __devinit | 297 | void ia64_mmu_init(void *my_cpu_data) |
298 | ia64_mmu_init (void *my_cpu_data) | ||
299 | { | 298 | { |
300 | unsigned long pta, impl_va_bits; | 299 | unsigned long pta, impl_va_bits; |
301 | extern void __devinit tlb_init (void); | 300 | extern void tlb_init(void); |
302 | 301 | ||
303 | #ifdef CONFIG_DISABLE_VHPT | 302 | #ifdef CONFIG_DISABLE_VHPT |
304 | # define VHPT_ENABLE_BIT 0 | 303 | # define VHPT_ENABLE_BIT 0 |
diff --git a/arch/ia64/mm/tlb.c b/arch/ia64/mm/tlb.c index 7b3cdc6c6d91..ed6129768681 100644 --- a/arch/ia64/mm/tlb.c +++ b/arch/ia64/mm/tlb.c | |||
@@ -337,8 +337,7 @@ flush_tlb_range (struct vm_area_struct *vma, unsigned long start, | |||
337 | } | 337 | } |
338 | EXPORT_SYMBOL(flush_tlb_range); | 338 | EXPORT_SYMBOL(flush_tlb_range); |
339 | 339 | ||
340 | void __devinit | 340 | void ia64_tlb_init(void) |
341 | ia64_tlb_init (void) | ||
342 | { | 341 | { |
343 | ia64_ptce_info_t uninitialized_var(ptce_info); /* GCC be quiet */ | 342 | ia64_ptce_info_t uninitialized_var(ptce_info); /* GCC be quiet */ |
344 | u64 tr_pgbits; | 343 | u64 tr_pgbits; |
diff --git a/arch/ia64/pci/fixup.c b/arch/ia64/pci/fixup.c index eab28e314022..5dc969dd4ac0 100644 --- a/arch/ia64/pci/fixup.c +++ b/arch/ia64/pci/fixup.c | |||
@@ -24,7 +24,7 @@ | |||
24 | * video device at this point. | 24 | * video device at this point. |
25 | */ | 25 | */ |
26 | 26 | ||
27 | static void __devinit pci_fixup_video(struct pci_dev *pdev) | 27 | static void pci_fixup_video(struct pci_dev *pdev) |
28 | { | 28 | { |
29 | struct pci_dev *bridge; | 29 | struct pci_dev *bridge; |
30 | struct pci_bus *bus; | 30 | struct pci_bus *bus; |
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 5faa66c5c2a8..55b72ad57329 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c | |||
@@ -116,8 +116,7 @@ struct pci_ops pci_root_ops = { | |||
116 | 116 | ||
117 | /* Called by ACPI when it finds a new root bus. */ | 117 | /* Called by ACPI when it finds a new root bus. */ |
118 | 118 | ||
119 | static struct pci_controller * __devinit | 119 | static struct pci_controller *alloc_pci_controller(int seg) |
120 | alloc_pci_controller (int seg) | ||
121 | { | 120 | { |
122 | struct pci_controller *controller; | 121 | struct pci_controller *controller; |
123 | 122 | ||
@@ -165,8 +164,8 @@ new_space (u64 phys_base, int sparse) | |||
165 | return i; | 164 | return i; |
166 | } | 165 | } |
167 | 166 | ||
168 | static u64 __devinit | 167 | static u64 add_io_space(struct pci_root_info *info, |
169 | add_io_space (struct pci_root_info *info, struct acpi_resource_address64 *addr) | 168 | struct acpi_resource_address64 *addr) |
170 | { | 169 | { |
171 | struct resource *resource; | 170 | struct resource *resource; |
172 | char *name; | 171 | char *name; |
@@ -226,8 +225,8 @@ out: | |||
226 | return ~0; | 225 | return ~0; |
227 | } | 226 | } |
228 | 227 | ||
229 | static acpi_status __devinit resource_to_window(struct acpi_resource *resource, | 228 | static acpi_status resource_to_window(struct acpi_resource *resource, |
230 | struct acpi_resource_address64 *addr) | 229 | struct acpi_resource_address64 *addr) |
231 | { | 230 | { |
232 | acpi_status status; | 231 | acpi_status status; |
233 | 232 | ||
@@ -249,8 +248,7 @@ static acpi_status __devinit resource_to_window(struct acpi_resource *resource, | |||
249 | return AE_ERROR; | 248 | return AE_ERROR; |
250 | } | 249 | } |
251 | 250 | ||
252 | static acpi_status __devinit | 251 | static acpi_status count_window(struct acpi_resource *resource, void *data) |
253 | count_window (struct acpi_resource *resource, void *data) | ||
254 | { | 252 | { |
255 | unsigned int *windows = (unsigned int *) data; | 253 | unsigned int *windows = (unsigned int *) data; |
256 | struct acpi_resource_address64 addr; | 254 | struct acpi_resource_address64 addr; |
@@ -263,7 +261,7 @@ count_window (struct acpi_resource *resource, void *data) | |||
263 | return AE_OK; | 261 | return AE_OK; |
264 | } | 262 | } |
265 | 263 | ||
266 | static __devinit acpi_status add_window(struct acpi_resource *res, void *data) | 264 | static acpi_status add_window(struct acpi_resource *res, void *data) |
267 | { | 265 | { |
268 | struct pci_root_info *info = data; | 266 | struct pci_root_info *info = data; |
269 | struct pci_window *window; | 267 | struct pci_window *window; |
@@ -324,8 +322,7 @@ static __devinit acpi_status add_window(struct acpi_resource *res, void *data) | |||
324 | return AE_OK; | 322 | return AE_OK; |
325 | } | 323 | } |
326 | 324 | ||
327 | struct pci_bus * __devinit | 325 | struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) |
328 | pci_acpi_scan_root(struct acpi_pci_root *root) | ||
329 | { | 326 | { |
330 | struct acpi_device *device = root->device; | 327 | struct acpi_device *device = root->device; |
331 | int domain = root->segment; | 328 | int domain = root->segment; |
@@ -396,7 +393,7 @@ out1: | |||
396 | return NULL; | 393 | return NULL; |
397 | } | 394 | } |
398 | 395 | ||
399 | static int __devinit is_valid_resource(struct pci_dev *dev, int idx) | 396 | static int is_valid_resource(struct pci_dev *dev, int idx) |
400 | { | 397 | { |
401 | unsigned int i, type_mask = IORESOURCE_IO | IORESOURCE_MEM; | 398 | unsigned int i, type_mask = IORESOURCE_IO | IORESOURCE_MEM; |
402 | struct resource *devr = &dev->resource[idx], *busr; | 399 | struct resource *devr = &dev->resource[idx], *busr; |
@@ -414,8 +411,7 @@ static int __devinit is_valid_resource(struct pci_dev *dev, int idx) | |||
414 | return 0; | 411 | return 0; |
415 | } | 412 | } |
416 | 413 | ||
417 | static void __devinit | 414 | static void pcibios_fixup_resources(struct pci_dev *dev, int start, int limit) |
418 | pcibios_fixup_resources(struct pci_dev *dev, int start, int limit) | ||
419 | { | 415 | { |
420 | int i; | 416 | int i; |
421 | 417 | ||
@@ -427,13 +423,13 @@ pcibios_fixup_resources(struct pci_dev *dev, int start, int limit) | |||
427 | } | 423 | } |
428 | } | 424 | } |
429 | 425 | ||
430 | void __devinit pcibios_fixup_device_resources(struct pci_dev *dev) | 426 | void pcibios_fixup_device_resources(struct pci_dev *dev) |
431 | { | 427 | { |
432 | pcibios_fixup_resources(dev, 0, PCI_BRIDGE_RESOURCES); | 428 | pcibios_fixup_resources(dev, 0, PCI_BRIDGE_RESOURCES); |
433 | } | 429 | } |
434 | EXPORT_SYMBOL_GPL(pcibios_fixup_device_resources); | 430 | EXPORT_SYMBOL_GPL(pcibios_fixup_device_resources); |
435 | 431 | ||
436 | static void __devinit pcibios_fixup_bridge_resources(struct pci_dev *dev) | 432 | static void pcibios_fixup_bridge_resources(struct pci_dev *dev) |
437 | { | 433 | { |
438 | pcibios_fixup_resources(dev, PCI_BRIDGE_RESOURCES, PCI_NUM_RESOURCES); | 434 | pcibios_fixup_resources(dev, PCI_BRIDGE_RESOURCES, PCI_NUM_RESOURCES); |
439 | } | 435 | } |
@@ -441,8 +437,7 @@ static void __devinit pcibios_fixup_bridge_resources(struct pci_dev *dev) | |||
441 | /* | 437 | /* |
442 | * Called after each bus is probed, but before its children are examined. | 438 | * Called after each bus is probed, but before its children are examined. |
443 | */ | 439 | */ |
444 | void __devinit | 440 | void pcibios_fixup_bus(struct pci_bus *b) |
445 | pcibios_fixup_bus (struct pci_bus *b) | ||
446 | { | 441 | { |
447 | struct pci_dev *dev; | 442 | struct pci_dev *dev; |
448 | 443 | ||
diff --git a/arch/ia64/sn/kernel/io_common.c b/arch/ia64/sn/kernel/io_common.c index 8630875e74b5..11f2275570fb 100644 --- a/arch/ia64/sn/kernel/io_common.c +++ b/arch/ia64/sn/kernel/io_common.c | |||
@@ -435,8 +435,7 @@ void sn_generate_path(struct pci_bus *pci_bus, char *address) | |||
435 | geo_slot(geoid)); | 435 | geo_slot(geoid)); |
436 | } | 436 | } |
437 | 437 | ||
438 | void __devinit | 438 | void sn_pci_fixup_bus(struct pci_bus *bus) |
439 | sn_pci_fixup_bus(struct pci_bus *bus) | ||
440 | { | 439 | { |
441 | 440 | ||
442 | if (SN_ACPI_BASE_SUPPORT()) | 441 | if (SN_ACPI_BASE_SUPPORT()) |
diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c index 4554f68b7865..b9992571c036 100644 --- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c +++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c | |||
@@ -977,7 +977,7 @@ int sn_hwperf_get_nearest_node(cnodeid_t node, | |||
977 | return e; | 977 | return e; |
978 | } | 978 | } |
979 | 979 | ||
980 | static int __devinit sn_hwperf_misc_register_init(void) | 980 | static int sn_hwperf_misc_register_init(void) |
981 | { | 981 | { |
982 | int e; | 982 | int e; |
983 | 983 | ||
diff --git a/arch/ia64/xen/irq_xen.c b/arch/ia64/xen/irq_xen.c index 01f479ee1c43..efb74dafec4d 100644 --- a/arch/ia64/xen/irq_xen.c +++ b/arch/ia64/xen/irq_xen.c | |||
@@ -273,9 +273,8 @@ xen_bind_early_percpu_irq(void) | |||
273 | */ | 273 | */ |
274 | 274 | ||
275 | #ifdef CONFIG_HOTPLUG_CPU | 275 | #ifdef CONFIG_HOTPLUG_CPU |
276 | static int __devinit | 276 | static int unbind_evtchn_callback(struct notifier_block *nfb, |
277 | unbind_evtchn_callback(struct notifier_block *nfb, | 277 | unsigned long action, void *hcpu) |
278 | unsigned long action, void *hcpu) | ||
279 | { | 278 | { |
280 | unsigned int cpu = (unsigned long)hcpu; | 279 | unsigned int cpu = (unsigned long)hcpu; |
281 | 280 | ||