lkml.org 
[lkml]   [2004]   [Feb]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[2.6 patch] lockmeter.h: remove kernel 2.2 #ifdef (i386 + alpha)
The patch below removes a kernel 2.2 #ifdef from the i386 and alpha 
lockmeter.h .

Please apply
Adrian

--- linux-2.6.2-mm1/include/asm-i386/lockmeter.h.old 2004-02-08 02:12:35.000000000 +0100
+++ linux-2.6.2-mm1/include/asm-i386/lockmeter.h 2004-02-08 02:12:49.000000000 +0100
@@ -31,14 +31,6 @@

#define THIS_CPU_NUMBER smp_processor_id()

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)
-#define local_irq_save(x) \
- __asm__ __volatile__("pushfl ; popl %0 ; cli":"=g" (x): /* no input */ :"memory")
-
-#define local_irq_restore(x) \
- __asm__ __volatile__("pushl %0 ; popfl": /* no output */ :"g" (x):"memory")
-#endif /* Linux version 2.2.x */
-
/*
* macros to cache and retrieve an index value inside of a spin lock
* these macros assume that there are less than 65536 simultaneous
--- linux-2.6.2-mm1/include/asm-alpha/lockmeter.h.old 2004-02-08 02:13:13.000000000 +0100
+++ linux-2.6.2-mm1/include/asm-alpha/lockmeter.h 2004-02-08 02:13:23.000000000 +0100
@@ -16,12 +16,6 @@
#define THIS_CPU_NUMBER smp_processor_id()

#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)
-#define local_irq_save(x) \
- __save_and_cli(x)
-#define local_irq_restore(x) \
- __restore_flags(x)
-#endif /* Linux version 2.2.x */

#define SPINLOCK_MAGIC_INIT /**/

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 14:00    [W:0.026 / U:0.576 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site