LU-1346 libcfs: cleanup libcfs primitive (linux-prim.h)

[fs/lustre-release.git] / lnet / klnds / qswlnd / qswlnd.h

diff --git a/lnet/klnds/qswlnd/qswlnd.h b/lnet/klnds/qswlnd/qswlnd.h
index d4a6964..49059d2 100644 (file)
--- a/lnet/klnds/qswlnd/qswlnd.h
+++ b/lnet/klnds/qswlnd/qswlnd.h
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,6 +26,8 @@
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -40,15 +40,9 @@
 
 #ifndef _QSWNAL_H
 #define _QSWNAL_H
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
 
 #include <qsnet/kernel.h>
 #undef printf                                   /* nasty QSW #define */
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
 #include <linux/module.h>
 
 #include <elan/epcomms.h>
@@ -63,7 +57,6 @@
 #include <net/sock.h>
 #include <linux/uio.h>
 
-#include <asm/system.h>
 #include <asm/uaccess.h>
 
 #include <linux/fs.h>
@@ -255,7 +248,7 @@ typedef struct
 #endif
 
 #if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
-        cfs_sysctl_table_header_t *kqn_sysctl;  /* sysctl interface */
+       struct ctl_table_header *kqn_sysctl;  /* sysctl interface */
 #endif
 } kqswnal_tunables_t;
 
@@ -271,10 +264,10 @@ typedef struct
 
         cfs_list_t           kqn_idletxds;    /* transmit descriptors free to use */
         cfs_list_t           kqn_activetxds;  /* transmit descriptors being used */
-        cfs_spinlock_t       kqn_idletxd_lock; /* serialise idle txd access */
-        cfs_atomic_t         kqn_pending_txs;/* # transmits being prepped */
+       spinlock_t      kqn_idletxd_lock;    /* serialise idle txd access */
+       cfs_atomic_t    kqn_pending_txs;     /* # transmits being prepped */
 
-        cfs_spinlock_t       kqn_sched_lock; /* serialise packet schedulers */
+       spinlock_t      kqn_sched_lock;      /* serialise packet schedulers */
         cfs_waitq_t          kqn_sched_waitq;/* scheduler blocks here */
 
         cfs_list_t           kqn_readyrxds;  /* rxds full of data */