rpms/kernel/devel git-linus.diff, 1.15, 1.16 kernel.spec, 1.1365, 1.1366

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9018

Modified Files:
	git-linus.diff kernel.spec 
Log Message:
* Tue Mar 03 2009 Dave Airlie <airlied at redhat.com>
- pull patch from Linus to fix build


git-linus.diff:

Index: git-linus.diff
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-linus.diff,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- git-linus.diff	27 Jan 2009 02:39:41 -0000	1.15
+++ git-linus.diff	3 Mar 2009 11:03:50 -0000	1.16
@@ -0,0 +1,77 @@
+From 2450cf51a1bdba7037e91b1bcc494b01c58aaf66 Mon Sep 17 00:00:00 2001
+From: Linus Torvalds <torvalds at linux-foundation.org>
+Date: Mon, 2 Mar 2009 16:23:33 -0800
+Subject: [PATCH] Revert "menu: fix embedded menu snafu"
+
+This reverts commit 155b25bcc28631a5b5230191aa3f56c40dfffa3f, which was
+totally wrong - the "embedded" options still exists (very much so) even
+on non-embedded platforms.
+
+It's just that we don't bother with actually asking about them when
+we're not embedded, we just take their default values (which is usually
+'y' - the options add features that may not be worth it in a constrained
+environment).
+
+Noticed-by: Andrew Morton <akpm at linux-foundation.org>
+Cc: Randy Dunlap <randy.dunlap at oracle.com>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+---
+ init/Kconfig |   28 ++++++++++++----------------
+ 1 files changed, 12 insertions(+), 16 deletions(-)
+
+diff --git a/init/Kconfig b/init/Kconfig
+index 9000316..f068071 100644
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -683,8 +683,6 @@ menuconfig EMBEDDED
+           environments which can tolerate a "non-standard" kernel.
+           Only use this if you really know what you are doing.
+ 
+-if EMBEDDED
+-
+ config UID16
+ 	bool "Enable 16-bit UID system calls" if EMBEDDED
+ 	depends on ARM || BLACKFIN || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && COMPAT) || UML || (X86_64 && IA32_EMULATION)
+@@ -782,6 +780,18 @@ config PCSPKR_PLATFORM
+           This option allows to disable the internal PC-Speaker
+           support, saving some memory.
+ 
++config COMPAT_BRK
++	bool "Disable heap randomization"
++	default y
++	help
++	  Randomizing heap placement makes heap exploits harder, but it
++	  also breaks ancient binaries (including anything libc5 based).
++	  This option changes the bootup default to heap randomization
++	  disabled, and can be overriden runtime by setting
++	  /proc/sys/kernel/randomize_va_space to 2.
++
++	  On non-ancient distros (post-2000 ones) N is usually a safe choice.
++
+ config BASE_FULL
+ 	default y
+ 	bool "Enable full-sized data structures for core" if EMBEDDED
+@@ -887,20 +897,6 @@ config SLUB_DEBUG
+ 	  SLUB sysfs support. /sys/slab will not exist and there will be
+ 	  no support for cache validation etc.
+ 
+-endif # EMBEDDED
+-
+-config COMPAT_BRK
+-	bool "Disable heap randomization"
+-	default y
+-	help
+-	  Randomizing heap placement makes heap exploits harder, but it
+-	  also breaks ancient binaries (including anything libc5 based).
+-	  This option changes the bootup default to heap randomization
+-	  disabled, and can be overriden runtime by setting
+-	  /proc/sys/kernel/randomize_va_space to 2.
+-
+-	  On non-ancient distros (post-2000 ones) N is usually a safe choice.
+-
+ choice
+ 	prompt "Choose SLAB allocator"
+ 	default SLUB
+-- 
+1.5.5.1
+


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1365
retrieving revision 1.1366
diff -u -r1.1365 -r1.1366
--- kernel.spec	3 Mar 2009 10:01:15 -0000	1.1365
+++ kernel.spec	3 Mar 2009 11:03:51 -0000	1.1366
@@ -1785,6 +1785,9 @@
 # and build.
 
 %changelog
+* Tue Mar 03 2009 Dave Airlie <airlied at redhat.com>
+- pull patch from Linus to fix build
+
 * Tue Mar 03 2009 Ben Skeggs <bskeggs at redhat.com>
 - nouveau: some gf8/9 and kms fixes