移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/drivers/net/ethernet/neterion/s2io.h
..
..
@@ -10,6 +10,7 @@
10
10
  * system is licensed under the GPL.
11
11
  * See the file COPYING in this distribution for more information.
12
12
  ************************************************************************/
13
+#include <linux/io-64-nonatomic-lo-hi.h>
13
14
 #ifndef _S2IO_H
14
15
 #define _S2IO_H
15
16
 
..
..
@@ -970,27 +971,6 @@
970
971
 #define RESET_ERROR 1
971
972
 #define CMD_ERROR   2
972
973
 
973
-/*  OS related system calls */
974
-#ifndef readq
975
-static inline u64 readq(void __iomem *addr)
976
-{
977
-	u64 ret = 0;
978
-	ret = readl(addr + 4);
979
-	ret <<= 32;
980
-	ret |= readl(addr);
981
-
982
-	return ret;
983
-}
984
-#endif
985
-
986
-#ifndef writeq
987
-static inline void writeq(u64 val, void __iomem *addr)
988
-{
989
-	writel((u32) (val), addr);
990
-	writel((u32) (val >> 32), (addr + 4));
991
-}
992
-#endif
993
-
994
974
 /*
995
975
  * Some registers have to be written in a particular order to
996
976
  * expect correct hardware operation. The macro SPECIAL_REG_WRITE
..
..
@@ -1085,7 +1065,7 @@
1085
1065
 static void tx_intr_handler(struct fifo_info *fifo_data);
1086
1066
 static void s2io_handle_errors(void * dev_id);
1087
1067
 
1088
-static void s2io_tx_watchdog(struct net_device *dev);
1068
+static void s2io_tx_watchdog(struct net_device *dev, unsigned int txqueue);
1089
1069
 static void s2io_set_multicast(struct net_device *dev);
1090
1070
 static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp);
1091
1071
 static void s2io_link(struct s2io_nic * sp, int link);