diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2007-08-04 21:02:22 +0000 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gnu.org> | 2009-06-18 00:27:12 +0200 |
| commit | baf29c7a7fe74d8ca799c869440f7b7cd5a33b8a (patch) | |
| tree | 1aa311c95f00f763667f2d8fb2c15a115825775a /linux/src/drivers | |
| parent | 2d38d0f995f30c5f04dcc0c10052f6c335f99987 (diff) | |
2007-08-04 Samuel Thibault <samuel.thibault@ens-lyon.org>
* linux/dev/arch/i386/kernel/irq.c: Include <asm/hardirq.h>.
(local_bh_count, local_irq_count, global_irq_holder, global_irq_lock)
(global_irq_count, check_smp_invalidate, show, wait_on_bh)
(wait_on_irq, synchronize_bh, synchronize_irq, get_irqlock)
(__global_cli, __global_sti, __global_save_flags)
(__global_restore_flags): New variables and functions from Linux 2.2
* linux/src/drivers/net/3c515.c (test_and_set_bit): Remove macro.
* linux/src/drivers/net/de4x5.c (test_and_set_bit): Remove macro.
* linux/src/drivers/net/eth16i.c (test_and_set_bit): Remove macro.
* linux/src/drivers/net/kern_compat.h (test_and_set_bit): Remove macro.
* linux/src/drivers/net/pcnet32.c (test_and_set_bit): Remove macro.
* linux/src/include/linux/compatmac.h (test_and_set_bit)
(test_and_clear_bit): Remove macro.
* linux/src/include/asm-i386/atomic.h (atomic_read): New macro.
* linux/src/include/asm-i386/bitops.h (test_and_set_bit)
(test_and_clear_bit, test_and_change_bit): New inline functions.
* linux/src/include/asm-i386/hardirq.h (local_bh_count): New
declaration.
* linux/src/include/linux/tasks.h (NR_CPUS): Set to NCPUS.
(NO_PROC_ID): New macro.
Diffstat (limited to 'linux/src/drivers')
| -rw-r--r-- | linux/src/drivers/net/3c515.c | 2 | ||||
| -rw-r--r-- | linux/src/drivers/net/de4x5.c | 2 | ||||
| -rw-r--r-- | linux/src/drivers/net/eth16i.c | 2 | ||||
| -rw-r--r-- | linux/src/drivers/net/kern_compat.h | 4 | ||||
| -rw-r--r-- | linux/src/drivers/net/pcnet32.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/linux/src/drivers/net/3c515.c b/linux/src/drivers/net/3c515.c index a283bab..fd6ec50 100644 --- a/linux/src/drivers/net/3c515.c +++ b/linux/src/drivers/net/3c515.c @@ -85,7 +85,7 @@ static int max_interrupt_work = 20; #define IRQ(irq, dev_id, pt_regs) (irq, dev_id, pt_regs) #if (LINUX_VERSION_CODE < 0x20123) -#define test_and_set_bit(val, addr) set_bit(val, addr) +//#define test_and_set_bit(val, addr) set_bit(val, addr) #elif defined(MODULE) MODULE_AUTHOR("Donald Becker <becker@cesdis.gsfc.nasa.gov>"); MODULE_DESCRIPTION("3Com 3c515 Corkscrew driver"); diff --git a/linux/src/drivers/net/de4x5.c b/linux/src/drivers/net/de4x5.c index b1ab417..114f6a7 100644 --- a/linux/src/drivers/net/de4x5.c +++ b/linux/src/drivers/net/de4x5.c @@ -445,7 +445,7 @@ static const char *version = "de4x5.c:V0.5351 1998/10/4 davies@maniac.ultranet.c #include <linux/version.h> #if LINUX_VERSION_CODE < LinuxVersionCode(2,1,0) # define __initfunc(__arginit) __arginit -# define test_and_set_bit set_bit +//# define test_and_set_bit set_bit # define net_device_stats enet_statistics # define copy_to_user(a,b,c) memcpy_tofs(a,b,c) # define copy_from_user(a,b,c) memcpy_fromfs(a,b,c) diff --git a/linux/src/drivers/net/eth16i.c b/linux/src/drivers/net/eth16i.c index 903b3ec..244c3e7 100644 --- a/linux/src/drivers/net/eth16i.c +++ b/linux/src/drivers/net/eth16i.c @@ -175,7 +175,7 @@ static char *version = #endif #if LINUX_VERSION_CODE < 0x20138 -#define test_and_set_bit(val,addr) set_bit(val,addr) +//#define test_and_set_bit(val,addr) set_bit(val,addr) #endif #if LINUX_VERSION_CODE < 0x020100 diff --git a/linux/src/drivers/net/kern_compat.h b/linux/src/drivers/net/kern_compat.h index 75c34b0..39e1934 100644 --- a/linux/src/drivers/net/kern_compat.h +++ b/linux/src/drivers/net/kern_compat.h @@ -2,7 +2,7 @@ #define _KERN_COMPAT_H /* kern_compat.h: Linux PCI network adapter backward compatibility code. */ /* - $Revision: 1.1.2.1 $ $Date: 2006/01/22 15:54:41 $ + $Revision: 1.1.2.2 $ $Date: 2007/08/04 21:02:21 $ Kernel compatibility defines. This file provides macros to mask the difference between kernel versions. @@ -76,7 +76,7 @@ __attribute__((section(".modinfo"))) = \ */ #if LINUX_VERSION_CODE < 0x20123 #define hard_smp_processor_id() smp_processor_id() -#define test_and_set_bit(val, addr) set_bit(val, addr) +//#define test_and_set_bit(val, addr) set_bit(val, addr) #define cpu_to_le16(val) (val) #define cpu_to_le32(val) (val) #define le16_to_cpu(val) (val) diff --git a/linux/src/drivers/net/pcnet32.c b/linux/src/drivers/net/pcnet32.c index acc5ce7..02e7098 100644 --- a/linux/src/drivers/net/pcnet32.c +++ b/linux/src/drivers/net/pcnet32.c @@ -105,7 +105,7 @@ static int pcnet32_debug = 1; #define le32_to_cpu(val) (val) #endif #if (LINUX_VERSION_CODE < 0x20123) -#define test_and_set_bit(val, addr) set_bit(val, addr) +//#define test_and_set_bit(val, addr) set_bit(val, addr) #endif #define TX_RING_SIZE (1 << (PCNET_LOG_TX_BUFFERS)) |