diff options
| author | Anders Magnusson <ragge@cvs.openbsd.org> | 2008-06-29 15:18:29 +0000 |
|---|---|---|
| committer | Anders Magnusson <ragge@cvs.openbsd.org> | 2008-06-29 15:18:29 +0000 |
| commit | fa74a75ce9a341df0ab678cbf29ca23900908cf3 (patch) | |
| tree | 4936b077896ef1c943c628524b75575cab900343 /sys/arch/i386 | |
| parent | 10c54579bcd895691226424f22c4a593188677ca (diff) | |
Don't fail compilation if APERTURE is not defined.
Also, fail probe if APERTURE is not defined.
Ok Marc Balmer.
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/i386/amdmsr.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/arch/i386/i386/amdmsr.c b/sys/arch/i386/i386/amdmsr.c index 511b94392ee..c957899bacb 100644 --- a/sys/arch/i386/i386/amdmsr.c +++ b/sys/arch/i386/i386/amdmsr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amdmsr.c,v 1.5 2008/06/19 09:58:40 mbalmer Exp $ */ +/* $OpenBSD: amdmsr.c,v 1.6 2008/06/29 15:18:28 ragge Exp $ */ /* * Copyright (c) 2008 Marc Balmer <mbalmer@openbsd.org> @@ -65,6 +65,7 @@ struct cfattach amdmsr_ca = { int amdmsr_probe(void) { +#ifdef APERTURE u_int64_t gld_msr_cap; int family, model, step; @@ -82,6 +83,7 @@ amdmsr_probe(void) return 1; } } +#endif return 0; } @@ -121,7 +123,9 @@ amdmsropen(dev_t dev, int flags, int devtype, struct proc *p) int amdmsrclose(dev_t dev, int flags, int devtype, struct proc *p) { +#ifdef APERTURE amdmsr_open_cnt--; +#endif return 0; } |