SOURCES: kernel-desktop-preempt-rt.patch - fixes for 2.6.18.2

[sparky]

Author: sparky                       Date: Mon Nov  6 20:07:43 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fixes for 2.6.18.2

---- Files affected:
SOURCES:
   kernel-desktop-preempt-rt.patch (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: SOURCES/kernel-desktop-preempt-rt.patch
diff -u SOURCES/kernel-desktop-preempt-rt.patch:1.17 SOURCES/kernel-desktop-preempt-rt.patch:1.18
--- SOURCES/kernel-desktop-preempt-rt.patch:1.17	Mon Nov  6 21:03:24 2006
+++ SOURCES/kernel-desktop-preempt-rt.patch	Mon Nov  6 21:07:37 2006
@@ -10610,7 +10610,7 @@
  
 +
  /* The quotient formula is taken from the IA64 port. */
- #define SPARC64_NSEC_PER_CYC_SHIFT	30UL
+ #define SPARC64_NSEC_PER_CYC_SHIFT	10UL
  void __init time_init(void)
  {
  	unsigned long clock = sparc64_init_timers();
@@ -14151,7 +14151,7 @@
 - 	if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) {
 -#ifdef CONFIG_ACPI
 -		/* But TSC doesn't tick in C3 so don't use it there */
--		if (acpi_fadt.length > 0 && acpi_fadt.plvl3_lat < 100)
+-		if (acpi_fadt.length > 0 && acpi_fadt.plvl3_lat < 1000)
 -			return 1;
 -#endif
 - 		return 0;
@@ -14707,7 +14707,7 @@
 + 	if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) {
 +#ifdef CONFIG_ACPI
 +		/* But TSC doesn't tick in C3 so don't use it there */
-+		if (acpi_fadt.length > 0 && acpi_fadt.plvl3_lat < 100)
++		if (acpi_fadt.length > 0 && acpi_fadt.plvl3_lat < 1000)
 +			return 1;
 +#endif
 + 		return 0;
@@ -53292,27 +53292,6 @@
  	unsigned int indirect;
  
  	if (copy_from_user(&data->id, &data32->id, sizeof(data->id)))
-Index: linux/sound/core/hwdep.c
-===================================================================
---- linux.orig/sound/core/hwdep.c
-+++ linux/sound/core/hwdep.c
-@@ -158,6 +158,7 @@ static int snd_hwdep_release(struct inod
- {
- 	int err = -ENXIO;
- 	struct snd_hwdep *hw = file->private_data;
-+	struct module *mod = hw->card->module;
- 	mutex_lock(&hw->open_mutex);
- 	if (hw->ops.release) {
- 		err = hw->ops.release(hw, file);
-@@ -167,7 +168,7 @@ static int snd_hwdep_release(struct inod
- 		hw->used--;
- 	snd_card_file_remove(hw->card, file);
- 	mutex_unlock(&hw->open_mutex);
--	module_put(hw->card->module);
-+	module_put(mod);
- 	return err;
- }
- 
 Index: linux/sound/core/pcm_lib.c
 ===================================================================
 --- linux.orig/sound/core/pcm_lib.c
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-desktop-preempt-rt.patch?r1=1.17&r2=1.18&f=u