diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2009-10-26 20:14:43 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2009-10-26 20:14:43 +0000 |
| commit | a9810f2e4406559596eb8337a7a35f248cdbb080 (patch) | |
| tree | 027638ddb5508c6551e679ab445d62238249c13d /sys/arch/mips64 | |
| parent | 12246e2cdd28b55501930660691d84be05add8d6 (diff) | |
Rename struct confargs to struct mainbus_attach_args for consistency and also
to prevent further abuse of it.
Diffstat (limited to 'sys/arch/mips64')
| -rw-r--r-- | sys/arch/mips64/mips64/clock.c | 6 | ||||
| -rw-r--r-- | sys/arch/mips64/mips64/cpu.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/mips64/mips64/clock.c b/sys/arch/mips64/mips64/clock.c index 765b87eeed0..71474a3404e 100644 --- a/sys/arch/mips64/mips64/clock.c +++ b/sys/arch/mips64/mips64/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.25 2009/10/22 22:08:54 miod Exp $ */ +/* $OpenBSD: clock.c,v 1.26 2009/10/26 20:14:40 miod Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -80,9 +80,9 @@ struct timecounter cp0_timecounter = { int clockmatch(struct device *parent, void *vcf, void *aux) { - struct confargs *ca = aux; + struct mainbus_attach_args *maa = aux; - if (strcmp(ca->ca_name, clock_cd.cd_name) != 0) + if (strcmp(maa->maa_name, clock_cd.cd_name) != 0) return 0; return 10; /* Try to get clock early */ diff --git a/sys/arch/mips64/mips64/cpu.c b/sys/arch/mips64/mips64/cpu.c index 747b7a6ed00..428285ee1ef 100644 --- a/sys/arch/mips64/mips64/cpu.c +++ b/sys/arch/mips64/mips64/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.14 2009/09/15 04:54:31 syuu Exp $ */ +/* $OpenBSD: cpu.c,v 1.15 2009/10/26 20:14:40 miod Exp $ */ /* * Copyright (c) 1997-2004 Opsycon AB (www.opsycon.se) @@ -80,10 +80,10 @@ int cpumatch(struct device *parent, void *match, void *aux) { struct cfdata *cf = match; - struct confargs *ca = aux; + struct mainbus_attach_args *maa = aux; /* make sure that we're looking for a CPU. */ - if (strcmp(ca->ca_name, cpu_cd.cd_name) != 0) + if (strcmp(maa->maa_name, cpu_cd.cd_name) != 0) return 0; if (cf->cf_unit >= MAX_CPUS) return 0; @@ -102,7 +102,7 @@ cpuattach(struct device *parent, struct device *dev, void *aux) #ifdef MULTIPROCESSOR cpuset_add(&cpus_running, ci); #endif - if(cpuno == 0) { + if (cpuno == 0) { ci = &cpu_info_primary; #ifdef MULTIPROCESSOR ci->ci_flags |= CPUF_RUNNING | CPUF_PRESENT | CPUF_PRIMARY; |