Re: [PATCH]: Prevent sn2 ptc code from executing on all ia64 subarches

Robin Holt
2005-12-09T17:11:58Z

Prarit, I don't think your patch catches all the cases. Try
this one.

Index: linux-2.6/arch/ia64/sn/kernel/sn2/sn_hwperf.c
=================================--- linux-2.6.orig/arch/ia64/sn/kernel/sn2/sn_hwperf.c 2005-11-21 20:05:40.000000000 -0600
+++ linux-2.6/arch/ia64/sn/kernel/sn2/sn_hwperf.c 2005-12-09 10:53:19.159948227 -0600
@@ -973,6 +973,9 @@ static int __devinit sn_hwperf_misc_regi
{
int e;

+ if (!ia64_platform_is("sn2"))
+ return -ENODEV;
+
sn_hwperf_init();

/*
Index: linux-2.6/arch/ia64/sn/kernel/mca.c
=================================--- linux-2.6.orig/arch/ia64/sn/kernel/mca.c 2005-11-09 10:53:59.000000000 -0600
+++ linux-2.6/arch/ia64/sn/kernel/mca.c 2005-12-09 10:49:52.089585038 -0600
@@ -136,6 +136,9 @@ int sn_salinfo_platform_oemdata(const u8

static int __init sn_salinfo_init(void)
{
+ if (!ia64_platform_is("sn2"))
+ return -ENODEV;
+
salinfo_platform_oemdata = &sn_salinfo_platform_oemdata;
return 0;
}
Index: linux-2.6/drivers/char/snsc.c
=================================--- linux-2.6.orig/drivers/char/snsc.c 2005-11-09 10:54:02.000000000 -0600
+++ linux-2.6/drivers/char/snsc.c 2005-12-09 10:54:48.619864496 -0600
@@ -375,7 +375,12 @@ scdrv_init(void)
struct sysctl_data_s *scd;
void *salbuf;
dev_t first_dev, dev;
- nasid_t event_nasid = ia64_sn_get_console_nasid();
+ nasid_t event_nasid;
+
+ if (!ia64_platform_is("sn2"))
+ return -ENODEV;
+
+ event_nasid = ia64_sn_get_console_nasid();

if (alloc_chrdev_region(&first_dev, 0, num_cnodes,
SYSCTL_BASENAME) < 0) {
Index: linux-2.6/drivers/pci/hotplug/sgi_hotplug.c
=================================--- linux-2.6.orig/drivers/pci/hotplug/sgi_hotplug.c 2005-11-09 10:54:05.000000000 -0600
+++ linux-2.6/drivers/pci/hotplug/sgi_hotplug.c 2005-12-09 10:49:46.197589209 -0600
@@ -552,6 +552,9 @@ static int sn_pci_hotplug_init(void)
int rc;
int registered = 0;

+ if (!ia64_platform_is("sn2"))
+ return -ENODEV;
+
if (sn_sal_rev() < SGI_HOTPLUG_PROM_REV) {
printk(KERN_ERR "%s: PROM version must be greater than 4.30\n",
__FUNCTION__);
Index: linux-2.6/drivers/sn/ioc4.c
=================================--- linux-2.6.orig/drivers/sn/ioc4.c 2005-11-09 10:54:06.000000000 -0600
+++ linux-2.6/drivers/sn/ioc4.c 2005-12-09 10:51:18.627908933 -0600
@@ -406,6 +406,9 @@ MODULE_DEVICE_TABLE(pci, ioc4_id_table);
static int __devinit
ioc4_init(void)
{
+ if (!ia64_platform_is("sn2"))
+ return -ENODEV;
+
return pci_register_driver(&ioc4_driver);
}