Remove __init specifier from function declarations in header files.

The specifier only needs to be added to the function's definition.

At the same time, fix init_cpu_to_node() to be __init rather than
__devinit (it is only called at boot time).

Signed-off-by: Keir Fraser <keir@xen.org>

diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c
index 19cb8df942bda752d1032062b5ed2e9175bb49a1..28b7dd429dfcd59b6b1901d1711f3d8bec0e264a 100644 (file)
--- a/xen/arch/x86/numa.c
+++ b/xen/arch/x86/numa.c
@@ -332,7 +332,7 @@ static __init int numa_setup(char *opt)
  * prior to this call, and this initialization is good enough
  * for the fake NUMA cases.
  */
-void __devinit init_cpu_to_node(void)
+void __init init_cpu_to_node(void)
 {
        int i, node;
        for (i = 0; i < NR_CPUS; i++) {

diff --git a/xen/drivers/passthrough/vtd/extern.h b/xen/drivers/passthrough/vtd/extern.h
index 60b7ac44f2194be832517d8d94397396b1cda71a..23d599530a6a7a1764405e03c19011d395303019 100644 (file)
--- a/xen/drivers/passthrough/vtd/extern.h
+++ b/xen/drivers/passthrough/vtd/extern.h
@@ -114,7 +114,7 @@ int domain_context_unmap_one(struct domain *domain, struct iommu *iommu,
                              u8 bus, u8 devfn);
 
 int is_igd_vt_enabled_quirk(void);
-void __init platform_quirks_init(void);
+void platform_quirks_init(void);
 void vtd_ops_preamble_quirk(struct iommu* iommu);
 void vtd_ops_postamble_quirk(struct iommu* iommu);
 void me_wifi_quirk(struct domain *domain, u8 bus, u8 devfn, int map);

diff --git a/xen/include/asm-x86/bzimage.h b/xen/include/asm-x86/bzimage.h
index 410ecd4cfe005b0cd0b647b71471220205fc19da..b6d1a81cc48bdc891eaa8a055de24b849d7e7c41 100644 (file)
--- a/xen/include/asm-x86/bzimage.h
+++ b/xen/include/asm-x86/bzimage.h
@@ -4,10 +4,9 @@
 #include <xen/config.h>
 #include <xen/init.h>
 
-int __init bzimage_headroom(char *image_start, unsigned long image_length);
+int bzimage_headroom(char *image_start, unsigned long image_length);
 
-int __init bzimage_parse(char *image_base,
-                       char **image_start,
-                       unsigned long *image_len);
+int bzimage_parse(char *image_base, char **image_start,
+                  unsigned long *image_len);
 
 #endif /* __X86_BZIMAGE_H__ */

diff --git a/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h b/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h
index 0bd92403fd8779ba809298fbb1c348192b6490f7..6b8112c2638bba0f43fcb7ee87e41f334b6660b2 100644 (file)
--- a/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h
+++ b/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h
@@ -39,13 +39,13 @@
     } while(0)
 
 /* amd-iommu-detect functions */
-int __init amd_iommu_get_ivrs_dev_entries(void);
-int __init amd_iommu_detect_one_acpi(void *ivhd);
-int __init amd_iommu_detect_acpi(void);
+int amd_iommu_get_ivrs_dev_entries(void);
+int amd_iommu_detect_one_acpi(void *ivhd);
+int amd_iommu_detect_acpi(void);
 
 /* amd-iommu-init functions */
-int __init amd_iommu_init(void);
-int __init amd_iommu_update_ivrs_mapping_acpi(void);
+int amd_iommu_init(void);
+int amd_iommu_update_ivrs_mapping_acpi(void);
 
 /* mapping functions */
 int amd_iommu_map_page(struct domain *d, unsigned long gfn, unsigned long mfn,
@@ -74,10 +74,10 @@ void flush_command_buffer(struct amd_iommu *iommu);
 /* find iommu for bdf */
 struct amd_iommu *find_iommu_for_device(int bdf);
 
-/*interrupt remapping */
-int __init amd_iommu_setup_ioapic_remapping(void);
-void*__init amd_iommu_alloc_intremap_table(void);
-void __init amd_iommu_free_intremap_table(int bdf);
+/* interrupt remapping */
+int amd_iommu_setup_ioapic_remapping(void);
+void *amd_iommu_alloc_intremap_table(void);
+void amd_iommu_free_intremap_table(int bdf);
 void invalidate_interrupt_table(struct amd_iommu *iommu, u16 device_id);
 void amd_iommu_ioapic_update_ire(
     unsigned int apic, unsigned int reg, unsigned int value);

diff --git a/xen/include/asm-x86/numa.h b/xen/include/asm-x86/numa.h
index b2a2255eb33d9524ca705da6045466d22867de53..abe7468446c833e9f0a6233ef4a5c5175f4c2a33 100644 (file)
--- a/xen/include/asm-x86/numa.h
+++ b/xen/include/asm-x86/numa.h
@@ -19,7 +19,7 @@ struct node {
        u64 start,end; 
 };
 
-extern int __init compute_hash_shift(struct node *nodes, int numnodes,
+extern int compute_hash_shift(struct node *nodes, int numnodes,
                              int *nodeids);
 extern int pxm_to_node(int nid);
 
@@ -39,7 +39,7 @@ extern void srat_detect_node(int cpu);
 extern void setup_node_bootmem(int nodeid, u64 start, u64 end);
 extern unsigned char apicid_to_node[];
 #ifdef CONFIG_NUMA
-extern void __init init_cpu_to_node(void);
+extern void init_cpu_to_node(void);
 
 static inline void clear_node_cpumask(int cpu)
 {