[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen-unstable] Remove __init specifier from function declarations in header files.
# HG changeset patch # User Keir Fraser <keir@xxxxxxx> # Date 1302078040 -3600 # Node ID 1984297894a7eda3fab89ea5fe866178d237f247 # Parent c7916d6f4dfba9d6c7eeb0fc2796068d75e2fb4a 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@xxxxxxx> --- diff -r c7916d6f4dfb -r 1984297894a7 xen/arch/x86/numa.c --- a/xen/arch/x86/numa.c Wed Apr 06 09:11:02 2011 +0100 +++ b/xen/arch/x86/numa.c Wed Apr 06 09:20:40 2011 +0100 @@ -332,7 +332,7 @@ * 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 -r c7916d6f4dfb -r 1984297894a7 xen/drivers/passthrough/vtd/extern.h --- a/xen/drivers/passthrough/vtd/extern.h Wed Apr 06 09:11:02 2011 +0100 +++ b/xen/drivers/passthrough/vtd/extern.h Wed Apr 06 09:20:40 2011 +0100 @@ -114,7 +114,7 @@ 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 -r c7916d6f4dfb -r 1984297894a7 xen/include/asm-x86/bzimage.h --- a/xen/include/asm-x86/bzimage.h Wed Apr 06 09:11:02 2011 +0100 +++ b/xen/include/asm-x86/bzimage.h Wed Apr 06 09:20:40 2011 +0100 @@ -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 -r c7916d6f4dfb -r 1984297894a7 xen/include/asm-x86/hvm/svm/amd-iommu-proto.h --- a/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h Wed Apr 06 09:11:02 2011 +0100 +++ b/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h Wed Apr 06 09:20:40 2011 +0100 @@ -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 @@ /* 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 -r c7916d6f4dfb -r 1984297894a7 xen/include/asm-x86/numa.h --- a/xen/include/asm-x86/numa.h Wed Apr 06 09:11:02 2011 +0100 +++ b/xen/include/asm-x86/numa.h Wed Apr 06 09:20:40 2011 +0100 @@ -19,7 +19,7 @@ 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 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) { _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |