[Adeos-main] [RESENT][PATCH 1/4] x86_64: remove unneeded i8253 lock conversion

[Adeos-main] [RESENT][PATCH 1/4] x86_64: remove unneeded i8253 lock conversion

[Jan Kiszka]

[-- Attachment #1.1: Type: text/plain, Size: 51 bytes --]

/me noticed that this one still applies...

Jan

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: remove-i8253_lock-conversion-x86_64.patch --]
[-- Type: text/x-patch; name="remove-i8253_lock-conversion-x86_64.patch", Size: 1077 bytes --]

---
 arch/x86_64/kernel/time.c  |    2 +-
 include/asm-x86_64/i8253.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6.23.1-xeno_64/arch/x86_64/kernel/time.c
===================================================================
--- linux-2.6.23.1-xeno_64.orig/arch/x86_64/kernel/time.c
+++ linux-2.6.23.1-xeno_64/arch/x86_64/kernel/time.c
@@ -51,7 +51,7 @@ static char *timename = NULL;
 
 DEFINE_SPINLOCK(rtc_lock);
 EXPORT_SYMBOL(rtc_lock);
-IPIPE_DEFINE_SPINLOCK(i8253_lock);
+DEFINE_SPINLOCK(i8253_lock);
 EXPORT_SYMBOL(i8253_lock);
 
 volatile unsigned long __jiffies __section_jiffies = INITIAL_JIFFIES;
Index: linux-2.6.23.1-xeno_64/include/asm-x86_64/i8253.h
===================================================================
--- linux-2.6.23.1-xeno_64.orig/include/asm-x86_64/i8253.h
+++ linux-2.6.23.1-xeno_64/include/asm-x86_64/i8253.h
@@ -1,6 +1,6 @@
 #ifndef __ASM_I8253_H__
 #define __ASM_I8253_H__
 
-IPIPE_DECLARE_SPINLOCK(i8253_lock);
+extern spinlock_t i8253_lock;
 
 #endif	/* __ASM_I8253_H__ */



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 254 bytes --]

Re: [Adeos-main] [RESENT][PATCH 1/4] x86_64: remove unneeded i8253 lock conversion

[Philippe Gerum]

Jan Kiszka wrote:
> /me noticed that this one still applies...
> 
> Jan
> 

Already merged in upcoming patch against 2.6.24-rc6. Will merge into
2.6.23 as well. Thanks.

-- 
Philippe.