diff options
Diffstat (limited to 'isys')
-rw-r--r-- | isys/isys.c | 8 | ||||
-rw-r--r-- | isys/isys.py | 12 | ||||
-rw-r--r-- | isys/smp.c | 21 | ||||
-rw-r--r-- | isys/smp.h | 1 |
4 files changed, 0 insertions, 42 deletions
diff --git a/isys/isys.c b/isys/isys.c index 7e75714ab..cdb6652f1 100644 --- a/isys/isys.c +++ b/isys/isys.c @@ -72,7 +72,6 @@ static PyObject * pyMakeDev(PyObject * s, PyObject * args); static PyObject * doMknod(PyObject * s, PyObject * args); static PyObject * smpAvailable(PyObject * s, PyObject * args); static PyObject * htAvailable(PyObject * s, PyObject * args); -static PyObject * summitAvailable(PyObject * s, PyObject * args); static PyObject * doCheckBoot(PyObject * s, PyObject * args); static PyObject * doSwapon(PyObject * s, PyObject * args); static PyObject * doSwapoff(PyObject * s, PyObject * args); @@ -148,7 +147,6 @@ static PyMethodDef isysModuleMethods[] = { { "mount", (PyCFunction) doMount, METH_VARARGS, NULL }, { "smpavailable", (PyCFunction) smpAvailable, METH_VARARGS, NULL }, { "htavailable", (PyCFunction) htAvailable, METH_VARARGS, NULL }, - { "summitavailable", (PyCFunction) summitAvailable, METH_VARARGS, NULL }, { "umount", (PyCFunction) doUMount, METH_VARARGS, NULL }, { "confignetdevice", (PyCFunction) doConfigNetDevice, METH_VARARGS, NULL }, { "pumpnetdevice", (PyCFunction) doPumpNetDevice, METH_VARARGS, NULL }, @@ -573,12 +571,6 @@ static PyObject * htAvailable(PyObject * s, PyObject * args) { return Py_BuildValue("i", detectHT()); } -static PyObject * summitAvailable(PyObject * s, PyObject * args) { - if (!PyArg_ParseTuple(args, "")) return NULL; - - return Py_BuildValue("i", detectSummit()); -} - void init_isys(void) { PyObject * m, * d; diff --git a/isys/isys.py b/isys/isys.py index 156d45a4f..00fef199a 100644 --- a/isys/isys.py +++ b/isys/isys.py @@ -227,18 +227,6 @@ def smpAvailable(): htavailable = _isys.htavailable -def summitavailable(): - try: - f = open("/proc/cmdline") - line = f.readline() - if string.find(line, " summit") != -1: - return 1 - del f - except: - pass - - return _isys.summitavailable() - def chroot (path): return os.chroot (path) diff --git a/isys/smp.c b/isys/smp.c index 8b7b25998..50ccda8eb 100644 --- a/isys/smp.c +++ b/isys/smp.c @@ -289,7 +289,6 @@ readType() } #define MODE_SMP_CHECK 1 -#define MODE_SUMMIT_CHECK 2 static int groupForSMP(int mode) { @@ -333,16 +332,6 @@ static int groupForSMP(int mode) return 0; } - if (mode == MODE_SUMMIT_CHECK) { - if (!strncmp(cth.oem_id, "IBM ENSW", 8) && - (!strncmp(cth.product_id, "NF 6000R", 8) || - !strncmp(cth.product_id, "VIGIL SMP", 9) || - !strncmp(cth.product_id, "EXA", 3) || - !strncmp(cth.product_id, "RUTHLESS", 8))) - return 1; - return 0; - } - count = cth.entry_count; for (i = 0; i < count; i++) { if ( readType() == 0 ) { @@ -614,11 +603,6 @@ int detectHT(void) return 0; } -int detectSummit(void) -{ - return groupForSMP(MODE_SUMMIT_CHECK); -} - #else /* ndef __i386__ */ int detectHT(void) @@ -626,11 +610,6 @@ int detectHT(void) return 0; } -int detectSummit(void) -{ - return 0; -} - #endif /* __i386__ */ int detectSMP(void) diff --git a/isys/smp.h b/isys/smp.h index f16938ac7..e03726826 100644 --- a/isys/smp.h +++ b/isys/smp.h @@ -3,6 +3,5 @@ int detectSMP(void); int detectHT(void); -int detectSummit(void); #endif /* SMP_H */ |