Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

arch/ia64/sn/kernel/mca.c

+3 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 * License.  See the file "COPYING" in the main directory of this archive

 * 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>
@@ -137,6 +137,7 @@ int sn_salinfo_platform_oemdata(const u8 *sect_header, u8 **oemdata, u64 *oemdat 


static int __init sn_salinfo_init(void)

{

	if (ia64_platform_is("sn2"))

		salinfo_platform_oemdata = &sn_salinfo_platform_oemdata;

	return 0;

}

arch/ia64/sn/kernel/sn2/sn_hwperf.c

+4 −1
Original line number Diff line number Diff line
@@ -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();



	/*