diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 17:06:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 17:06:51 -0800 |
| commit | 0bdd340c092b0936f78a54bdbd3927463ed4fca3 (patch) | |
| tree | d9215d382cdc4c2dc6366a2c551079590e8b8216 /arch/ia64/sn/kernel/sn2/sn_hwperf.c | |
| parent | 9908104935325bd6beba67d637b6f5396d47075c (diff) | |
| parent | f478af9dc58c01880832a321c3eea7703772c420 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch/ia64/sn/kernel/sn2/sn_hwperf.c')
| -rw-r--r-- | arch/ia64/sn/kernel/sn2/sn_hwperf.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c index 19b54fbcd7e..70db21f3df2 100644 --- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c +++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c @@ -3,7 +3,7 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. * - * Copyright (C) 2004-2005 Silicon Graphics, Inc. All rights reserved. + * Copyright (C) 2004-2006 Silicon Graphics, Inc. All rights reserved. * * SGI Altix topology and hardware performance monitoring API. * Mark Goodwin <markgw@sgi.com>. @@ -973,6 +973,9 @@ static int __devinit sn_hwperf_misc_register_init(void) { int e; + if (!ia64_platform_is("sn2")) + return 0; + sn_hwperf_init(); /* |