aboutsummaryrefslogtreecommitdiff
path: root/src/cpu/x86
diff options
context:
space:
mode:
Diffstat (limited to 'src/cpu/x86')
-rw-r--r--src/cpu/x86/lapic/lapic_cpu_init.c8
-rw-r--r--src/cpu/x86/mp_init.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c b/src/cpu/x86/lapic/lapic_cpu_init.c
index 09b6b9eeb0..018924f11d 100644
--- a/src/cpu/x86/lapic/lapic_cpu_init.c
+++ b/src/cpu/x86/lapic/lapic_cpu_init.c
@@ -253,7 +253,7 @@ static void *stacks[CONFIG_MAX_CPUS];
volatile unsigned long secondary_stack;
volatile unsigned int secondary_cpu_index;
-int start_cpu(device_t cpu)
+int start_cpu(struct device *cpu)
{
struct cpu_info *info;
unsigned long stack_end;
@@ -430,9 +430,9 @@ void asmlinkage secondary_cpu_init(unsigned int index)
stop_this_cpu();
}
-static void start_other_cpus(struct bus *cpu_bus, device_t bsp_cpu)
+static void start_other_cpus(struct bus *cpu_bus, struct device *bsp_cpu)
{
- device_t cpu;
+ struct device *cpu;
/* Loop through the cpus once getting them started */
for(cpu = cpu_bus->children; cpu ; cpu = cpu->sibling) {
@@ -465,7 +465,7 @@ static void start_other_cpus(struct bus *cpu_bus, device_t bsp_cpu)
static void wait_other_cpus_stop(struct bus *cpu_bus)
{
- device_t cpu;
+ struct device *cpu;
int old_active_count, active_count;
long loopcount = 0;
int i;
diff --git a/src/cpu/x86/mp_init.c b/src/cpu/x86/mp_init.c
index e83c23d3f4..a97a4c532b 100644
--- a/src/cpu/x86/mp_init.c
+++ b/src/cpu/x86/mp_init.c
@@ -86,7 +86,7 @@ struct mp_flight_plan {
static struct mp_flight_plan mp_info;
struct cpu_map {
- device_t dev;
+ struct device *dev;
int apic_id;
};
@@ -328,7 +328,7 @@ static int allocate_cpu_devices(struct bus *cpu_bus, struct mp_params *p)
info = cpu_info();
for (i = 1; i < max_cpus; i++) {
struct device_path cpu_path;
- device_t new;
+ struct device *new;
int apic_id;
/* Build the cpu device path */