On Wed, 13 Jul 2011 16:19:35 -0500
"Jeff Krasky" <jeff.kra...@dspcg.com> wrote:

> > 2. How to get past this make error: In file included from
> > /root/Desktop/etherlabmaster-4adb56c4198d/master/master.h:48,
> >                  from
> > /root/Desktop/etherlabmaster-4adb56c4198d/master/cdev.c:42:
> > /root/Desktop/etherlabmaster-4adb56c4198d/master/ethernet.h:42:29:
> > error:
> > linux/semaphore.h: No such file or directory
> > 
Hi
See the attached patch to get a little further... I now get to the
module.c file and fails there;
http://paste.opensuse.org/7758400

-- 
Cheers Malcolm °¿° (Linux Counter #276890)
openSUSE 11.4 (x86_64) Kernel 2.6.37.6-0.5-desktop
up 3 days 17:02, 5 users, load average: 0.23, 0.41, 0.38
GPU GeForce 8600 GTS Silent - Driver Version: 270.41.19
--- devices/generic.c	2010-08-25 16:34:15.000000000 -0500
+++ devices/generic.c.orig	2011-07-13 15:21:23.000000000 -0500
@@ -405,7 +405,11 @@
     INIT_LIST_HEAD(&descs);
 
     read_lock(&dev_base_lock);
+#if LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 16)
+    for(netdev = dev_base; netdev != NULL; netdev = netdev->next) {
+#else
     for_each_netdev(&init_net, netdev) {
+#endif
         if (netdev->type != ARPHRD_ETHER)
             continue;
         desc = kmalloc(sizeof(ec_gen_interface_desc_t), GFP_ATOMIC);
--- master/cdev.c	2010-08-25 16:34:15.000000000 -0500
+++ master/cdev.c.orig	2011-07-13 15:22:53.000000000 -0500
@@ -3794,7 +3794,7 @@
 
     page = vmalloc_to_page(priv->process_data + offset);
 
-    EC_MASTER_DBG(master, "Nopage fault vma, address = %#lx,"
+    EC_MASTER_DBG(priv->cdev->master, 1, "Nopage fault vma, address = %#lx,"
             " offset = %#lx, page = %p\n", address, offset, page);
 
     get_page(page);
--- master/ethernet.h	2010-08-25 16:34:15.000000000 -0500
+++ master/ethernet.h.orig	2011-07-13 15:24:00.000000000 -0500
@@ -39,6 +39,11 @@
 
 #include <linux/list.h>
 #include <linux/netdevice.h>
+#if LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 16)
+#include <asm/semaphore.h>
+#else
+#include <linux/semaphore.h>
+#endif
 
 #include "globals.h"
 #include "slave.h"
--- master/slave.h	2010-08-25 16:34:15.000000000 -0500
+++ master/slave.h.orig	2011-07-13 17:36:49.000000000 -0500
@@ -39,6 +39,7 @@
 
 #include <linux/list.h>
 #include <linux/kobject.h>
+#include <linux/sched.h>
 
 #include "globals.h"
 #include "datagram.h"
--- tty/module.c	2010-08-25 16:34:15.000000000 -0500
+++ tty/module.c.orig	2011-07-13 17:46:39.000000000 -0500
@@ -42,7 +42,11 @@
 #include <linux/timer.h>
 #include <linux/version.h>
 #include <linux/serial.h>
+#if LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 16)
+#include <asm/uaccess.h>
+#else
 #include <linux/uaccess.h>
+#endif
 
 #include "../master/globals.h"
 #include "../include/ectty.h"
_______________________________________________
etherlab-users mailing list
etherlab-users@etherlab.org
http://lists.etherlab.org/mailman/listinfo/etherlab-users

Reply via email to