Commit f478af9d authored by Jes Sorensen's avatar Jes Sorensen Committed by Tony Luck

[IA64] prevent sn2 specific code to be run in generic kernels

Prevent SN2 specific code to be executed on non SN2 platforms when
running a generic kernel.
Signed-off-by: default avatarJes Sorensen <jes@sgi.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent d6e56a2a
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* License. See the file "COPYING" in the main directory of this archive * License. See the file "COPYING" in the main directory of this archive
* for more details. * for more details.
* *
* Copyright (c) 2000-2004 Silicon Graphics, Inc. All Rights Reserved. * Copyright (c) 2000-2006 Silicon Graphics, Inc. All Rights Reserved.
*/ */
#include <linux/types.h> #include <linux/types.h>
...@@ -137,6 +137,7 @@ int sn_salinfo_platform_oemdata(const u8 *sect_header, u8 **oemdata, u64 *oemdat ...@@ -137,6 +137,7 @@ int sn_salinfo_platform_oemdata(const u8 *sect_header, u8 **oemdata, u64 *oemdat
static int __init sn_salinfo_init(void) static int __init sn_salinfo_init(void)
{ {
if (ia64_platform_is("sn2"))
salinfo_platform_oemdata = &sn_salinfo_platform_oemdata; salinfo_platform_oemdata = &sn_salinfo_platform_oemdata;
return 0; return 0;
} }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* License. See the file "COPYING" in the main directory of this archive * License. See the file "COPYING" in the main directory of this archive
* for more details. * 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. * SGI Altix topology and hardware performance monitoring API.
* Mark Goodwin <markgw@sgi.com>. * Mark Goodwin <markgw@sgi.com>.
...@@ -973,6 +973,9 @@ static int __devinit sn_hwperf_misc_register_init(void) ...@@ -973,6 +973,9 @@ static int __devinit sn_hwperf_misc_register_init(void)
{ {
int e; int e;
if (!ia64_platform_is("sn2"))
return 0;
sn_hwperf_init(); sn_hwperf_init();
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment