rpms/kernel/devel kernel-2.6.spec, 1.3186, 1.3187 linux-2.6-debug-no-quiet.patch, 1.4, 1.5 linux-2.6-execshield.patch, 1.53, 1.54 linux-2.6-debug-sleep-in-irq-warning.patch, 1.3, NONE

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7758

Modified Files:
	kernel-2.6.spec linux-2.6-debug-no-quiet.patch 
	linux-2.6-execshield.patch 
Removed Files:
	linux-2.6-debug-sleep-in-irq-warning.patch 
Log Message:
build fixes


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3186
retrieving revision 1.3187
diff -u -r1.3186 -r1.3187
--- kernel-2.6.spec	28 May 2007 05:17:47 -0000	1.3186
+++ kernel-2.6.spec	28 May 2007 06:33:16 -0000	1.3187
@@ -408,7 +408,6 @@
 Patch280: linux-2.6-debug-spinlock-taint.patch
 Patch290: linux-2.6-debug-extra-warnings.patch
 Patch300: linux-2.6-debug-slub-debug.patch
-Patch310: linux-2.6-debug-sleep-in-irq-warning.patch
 Patch320: linux-2.6-debug-must_check.patch
 Patch330: linux-2.6-debug-no-quiet.patch
 Patch340: linux-2.6-debug-boot-delay.patch
@@ -954,7 +953,6 @@
 ApplyPatch linux-2.6-debug-slub-debug.patch
 %endif
 
-ApplyPatch linux-2.6-debug-sleep-in-irq-warning.patch
 ApplyPatch linux-2.6-debug-must_check.patch
 ApplyPatch linux-2.6-debug-no-quiet.patch
 ApplyPatch linux-2.6-debug-boot-delay.patch

linux-2.6-debug-no-quiet.patch:

Index: linux-2.6-debug-no-quiet.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-debug-no-quiet.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-debug-no-quiet.patch	19 Mar 2007 21:32:30 -0000	1.4
+++ linux-2.6-debug-no-quiet.patch	28 May 2007 06:33:16 -0000	1.5
@@ -14,18 +14,14 @@
  	return 1;
  }
  
---- linux-2.6.20.noarch/lib/Kconfig.debug~	2007-03-19 17:27:40.000000000 -0400
-+++ linux-2.6.20.noarch/lib/Kconfig.debug	2007-03-19 17:27:51.000000000 -0400
-@@ -4,6 +4,12 @@ config DEBUG_SLEEP_IN_IRQ
- 	  Sleeping in an interrupt handler is a bad thing.
- 	  Enabling this option will emit a backtrace (once per instance).
- 
+--- linux-2.6.21.noarch/lib/Kconfig.debug~	2007-05-28 02:18:07.000000000 -0400
++++ linux-2.6.21.noarch/lib/Kconfig.debug	2007-05-28 02:18:43.000000000 -0400
+@@ -1,3 +1,8 @@
 +config DEBUG_IGNORE_QUIET
-+       bool "Ignore 'quiet' boot argument"
-+       help
-+         If this option is set, the boot parameter 'quiet' will have
-+         no effect.
-+
++	bool "Ignore 'quiet' boot argument"
++	help
++	  If this option is set, the boot parameter 'quiet' will have
++	  no effect.
+ 
  config PRINTK_TIME
  	bool "Show timing information on printks"
- 	depends on PRINTK

linux-2.6-execshield.patch:

Index: linux-2.6-execshield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-execshield.patch,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- linux-2.6-execshield.patch	28 May 2007 03:29:08 -0000	1.53
+++ linux-2.6-execshield.patch	28 May 2007 06:33:16 -0000	1.54
@@ -761,7 +761,7 @@
 ===================================================================
 --- linux-2.6.orig/arch/x86_64/mm/mmap.c
 +++ linux-2.6/arch/x86_64/mm/mmap.c
-@@ -1,29 +1,87 @@
+@@ -1,29 +1,88 @@
 -/* Copyright 2005 Andi Kleen, SuSE Labs.
 - * Licensed under GPL, v.2
 +/*
@@ -792,7 +792,7 @@
 +
 +#include <linux/personality.h>
  #include <linux/mm.h>
--#include <linux/sched.h>
+ #include <linux/sched.h>
  #include <linux/random.h>
 -#include <asm/ia32.h>
  


--- linux-2.6-debug-sleep-in-irq-warning.patch DELETED ---