SOURCES: kernel-desktop-preempt-rt.patch, kernel-desktop-small_fix...

[sparky]

Author: sparky                       Date: Mon Jun 19 23:28:38 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- HAVE_MONOTONIC fix moved to preempt-rt.patch

---- Files affected:
SOURCES:
   kernel-desktop-preempt-rt.patch (1.10 -> 1.11) , kernel-desktop-small_fixes.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/kernel-desktop-preempt-rt.patch
diff -u SOURCES/kernel-desktop-preempt-rt.patch:1.10 SOURCES/kernel-desktop-preempt-rt.patch:1.11
--- SOURCES/kernel-desktop-preempt-rt.patch:1.10	Sun Jun 18 15:47:04 2006
+++ SOURCES/kernel-desktop-preempt-rt.patch	Tue Jun 20 01:28:33 2006
@@ -18922,7 +18922,7 @@
  #endif /* not MODULE */
  
 -#if defined(CONFIG_X86) || defined(CONFIG_S390)
-+#if defined(CONFIG_X86_64) || defined(CONFIG_S390)
++#if defined(CONFIG_S390)
  # define HAVE_MONOTONIC
  # define TIMER_FREQ 1000000000ULL
  #elif defined(CONFIG_IA64)

================================================================
Index: SOURCES/kernel-desktop-small_fixes.patch
diff -u SOURCES/kernel-desktop-small_fixes.patch:1.5 SOURCES/kernel-desktop-small_fixes.patch:1.6
--- SOURCES/kernel-desktop-small_fixes.patch:1.5	Mon Jun 19 22:16:03 2006
+++ SOURCES/kernel-desktop-small_fixes.patch	Tue Jun 20 01:28:33 2006
@@ -54,19 +54,6 @@
  				spin_unlock(&(cachep->nodelists[nodeid])->
  					    list_lock);
  			}
---- linux-2.6.17/drivers/char/hangcheck-timer.c~	2006-06-19 22:03:01.000000000 +0200
-+++ linux-2.6.17/drivers/char/hangcheck-timer.c	2006-06-19 22:02:21.000000000 +0200
-@@ -118,7 +118,9 @@
- #endif /* not MODULE */
- 
- #if defined(CONFIG_X86_64) || defined(CONFIG_S390)
--# define HAVE_MONOTONIC
-+# if defined(CONFIG_S390)
-+#  define HAVE_MONOTONIC
-+# endif
- # define TIMER_FREQ 1000000000ULL
- #elif defined(CONFIG_IA64)
- # define TIMER_FREQ ((unsigned long long)local_cpu_data->itc_freq)
 --- linux-2.6.17/mm/readahead.c~	2006-06-18 03:49:35.000000000 +0200
 +++ linux-2.6.17/mm/readahead.c	2006-06-19 22:09:12.000000000 +0200
 @@ -573,6 +573,7 @@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-desktop-preempt-rt.patch?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-desktop-small_fixes.patch?r1=1.5&r2=1.6&f=u