|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH 2/6] xen/arm: domain_build: Move all DOM0 building code in init section
The code to build DOM0 is only used during Xen boot.
Signed-off-by: Julien Grall <julien.grall@xxxxxxxxxx>
---
xen/arch/arm/domain_build.c | 66 ++++++++++++++++++++++-----------------------
xen/include/asm-arm/setup.h | 2 +-
2 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index c2dcb49..d30df08 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -76,7 +76,7 @@ struct vcpu *__init alloc_dom0_vcpu0(struct domain *dom0)
return alloc_vcpu(dom0, 0, 0);
}
-static unsigned int get_11_allocation_size(paddr_t size)
+static unsigned int __init get_11_allocation_size(paddr_t size)
{
/*
* get_order_from_bytes returns the order greater than or equal to
@@ -94,10 +94,10 @@ static unsigned int get_11_allocation_size(paddr_t size)
* Returns false if the memory would be below bank 0 or we have run
* out of banks. In this case it will free the pages.
*/
-static bool_t insert_11_bank(struct domain *d,
- struct kernel_info *kinfo,
- struct page_info *pg,
- unsigned int order)
+static bool_t __init insert_11_bank(struct domain *d,
+ struct kernel_info *kinfo,
+ struct page_info *pg,
+ unsigned int order)
{
int res, i;
paddr_t spfn;
@@ -240,7 +240,8 @@ fail:
* (as described above) we allow higher allocations and continue until
* that runs out (or we have allocated sufficient dom0 memory).
*/
-static void allocate_memory_11(struct domain *d, struct kernel_info *kinfo)
+static void __init allocate_memory_11(struct domain *d,
+ struct kernel_info *kinfo)
{
const unsigned int min_low_order =
get_order_from_bytes(min_t(paddr_t, dom0_mem, MB(128)));
@@ -348,7 +349,7 @@ static void allocate_memory_11(struct domain *d, struct
kernel_info *kinfo)
}
}
-static void allocate_memory(struct domain *d, struct kernel_info *kinfo)
+static void __init allocate_memory(struct domain *d, struct kernel_info *kinfo)
{
struct dt_device_node *memory = NULL;
@@ -398,8 +399,8 @@ static void allocate_memory(struct domain *d, struct
kernel_info *kinfo)
}
}
-static int write_properties(struct domain *d, struct kernel_info *kinfo,
- const struct dt_device_node *node)
+static int __init write_properties(struct domain *d, struct kernel_info *kinfo,
+ const struct dt_device_node *node)
{
const char *bootargs = NULL;
const struct dt_property *prop;
@@ -504,8 +505,8 @@ static int write_properties(struct domain *d, struct
kernel_info *kinfo,
typedef __be32 gic_interrupt_t[3];
-static void set_interrupt_ppi(gic_interrupt_t interrupt, unsigned int irq,
- unsigned int cpumask, unsigned int level)
+static void __init set_interrupt_ppi(gic_interrupt_t interrupt, unsigned int
irq,
+ unsigned int cpumask, unsigned int level)
{
__be32 *cells = interrupt;
@@ -523,8 +524,8 @@ static void set_interrupt_ppi(gic_interrupt_t interrupt,
unsigned int irq,
* "interrupts": contains the list of interrupts
* "interrupt-parent": link to the GIC
*/
-static int fdt_property_interrupts(void *fdt, gic_interrupt_t *intr,
- unsigned num_irq)
+static int __init fdt_property_interrupts(void *fdt, gic_interrupt_t *intr,
+ unsigned num_irq)
{
int res;
@@ -538,10 +539,9 @@ static int fdt_property_interrupts(void *fdt,
gic_interrupt_t *intr,
return res;
}
-static int make_memory_node(const struct domain *d,
- void *fdt,
- const struct dt_device_node *parent,
- const struct kernel_info *kinfo)
+static int __init make_memory_node(const struct domain *d, void *fdt,
+ const struct dt_device_node *parent,
+ const struct kernel_info *kinfo)
{
int res, i;
int reg_size = dt_n_addr_cells(parent) + dt_n_size_cells(parent);
@@ -581,8 +581,8 @@ static int make_memory_node(const struct domain *d,
return res;
}
-static int make_hypervisor_node(struct domain *d,
- void *fdt, const struct dt_device_node *parent)
+static int __init make_hypervisor_node(struct domain *d, void *fdt,
+ const struct dt_device_node *parent)
{
const char compat[] =
"xen,xen-"__stringify(XEN_VERSION)"."__stringify(XEN_SUBVERSION)"\0"
@@ -646,7 +646,7 @@ static int make_hypervisor_node(struct domain *d,
return res;
}
-static int make_psci_node(void *fdt, const struct dt_device_node *parent)
+static int __init make_psci_node(void *fdt, const struct dt_device_node
*parent)
{
int res;
const char compat[] =
@@ -681,8 +681,8 @@ static int make_psci_node(void *fdt, const struct
dt_device_node *parent)
return res;
}
-static int make_cpus_node(const struct domain *d, void *fdt,
- const struct dt_device_node *parent)
+static int __init make_cpus_node(const struct domain *d, void *fdt,
+ const struct dt_device_node *parent)
{
int res;
const struct dt_device_node *cpus = dt_find_node_by_path("/cpus");
@@ -785,8 +785,8 @@ static int make_cpus_node(const struct domain *d, void *fdt,
return res;
}
-static int make_gic_node(const struct domain *d, void *fdt,
- const struct dt_device_node *node)
+static int __init make_gic_node(const struct domain *d, void *fdt,
+ const struct dt_device_node *node)
{
const struct dt_device_node *gic = dt_interrupt_controller;
int res = 0;
@@ -834,8 +834,8 @@ static int make_gic_node(const struct domain *d, void *fdt,
return res;
}
-static int make_timer_node(const struct domain *d, void *fdt,
- const struct dt_device_node *node)
+static int __init make_timer_node(const struct domain *d, void *fdt,
+ const struct dt_device_node *node)
{
static const struct dt_device_match timer_ids[] __initconst =
{
@@ -910,7 +910,7 @@ static int make_timer_node(const struct domain *d, void
*fdt,
}
/* Map the device in the domain */
-static int map_device(struct domain *d, struct dt_device_node *dev)
+static int __init map_device(struct domain *d, struct dt_device_node *dev)
{
unsigned int nirq;
unsigned int naddr;
@@ -1020,8 +1020,8 @@ static int map_device(struct domain *d, struct
dt_device_node *dev)
return 0;
}
-static int handle_node(struct domain *d, struct kernel_info *kinfo,
- struct dt_device_node *node)
+static int __init handle_node(struct domain *d, struct kernel_info *kinfo,
+ struct dt_device_node *node)
{
static const struct dt_device_match skip_matches[] __initconst =
{
@@ -1155,7 +1155,7 @@ static int handle_node(struct domain *d, struct
kernel_info *kinfo,
return res;
}
-static int prepare_dtb(struct domain *d, struct kernel_info *kinfo)
+static int __init prepare_dtb(struct domain *d, struct kernel_info *kinfo)
{
const void *fdt;
int new_size;
@@ -1192,7 +1192,7 @@ static int prepare_dtb(struct domain *d, struct
kernel_info *kinfo)
return -EINVAL;
}
-static void dtb_load(struct kernel_info *kinfo)
+static void __init dtb_load(struct kernel_info *kinfo)
{
void * __user dtb_virt = (void * __user)(register_t)kinfo->dtb_paddr;
unsigned long left;
@@ -1207,7 +1207,7 @@ static void dtb_load(struct kernel_info *kinfo)
xfree(kinfo->fdt);
}
-static void initrd_load(struct kernel_info *kinfo)
+static void __init initrd_load(struct kernel_info *kinfo)
{
const struct bootmodule *mod = kinfo->initrd_bootmodule;
paddr_t load_addr = kinfo->initrd_paddr;
@@ -1271,7 +1271,7 @@ static void initrd_load(struct kernel_info *kinfo)
}
}
-int construct_dom0(struct domain *d)
+int __init construct_dom0(struct domain *d)
{
struct kernel_info kinfo = {};
struct vcpu *saved_current;
diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h
index ed2ba16..113655d 100644
--- a/xen/include/asm-arm/setup.h
+++ b/xen/include/asm-arm/setup.h
@@ -53,7 +53,7 @@ void copy_from_paddr(void *dst, paddr_t paddr, unsigned long
len);
void arch_get_xen_caps(xen_capabilities_info_t *info);
-int construct_dom0(struct domain *d);
+int __init construct_dom0(struct domain *d);
void discard_initial_modules(void);
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |