Merge cleanup

3 files changed, 56 insertions, 3 deletions

diff --git a/kernel.spec b/kernel.spec
index 4b0bb261a..b4cff0f93 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 1
+%global baserelease 2
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -652,6 +652,7 @@ Patch09: linux-2.6-upstream-reverts.patch
 Patch100: taint-vbox.patch
 Patch160: linux-2.6-32bit-mmap-exec-randomization.patch
 Patch161: linux-2.6-i386-nx-emulation.patch
+Patch162: nx-emu-remove-cpuinitdata-for-disable_nx-on-x86_32.patch
 
 Patch390: linux-2.6-defaults-acpi-video.patch
 Patch391: linux-2.6-acpi-video-dos.patch
@@ -1298,6 +1299,7 @@ ApplyPatch taint-vbox.patch
 # x86(-64)
 ApplyPatch linux-2.6-32bit-mmap-exec-randomization.patch
 ApplyPatch linux-2.6-i386-nx-emulation.patch
+ApplyPatch nx-emu-remove-cpuinitdata-for-disable_nx-on-x86_32.patch
 
 #
 # ARM
@@ -2292,6 +2294,12 @@ fi
 * Thu Mar 29 2012 Justin M. Forbes <jforbes@redhat.com> - 3.4.0-0.rc0.git4.1
 - Linux v3.3-8839-gb5174fa
 
+* Thu Mar 29 2012 Josh Boyer <jwboyer@redhat.com>
+- Drop __cpuinitdata on disable_nx for x86_32 (rhbz 808075)
+
+* Wed Mar 28 2012 Josh Boyer <jwboyer@redhat.com>
+- Move 9p modules back to main package for KVM (rhbz 807733)
+
 * Wed Mar 28 2012 Justin M. Forbes <jforbes@redhat.com> - 3.4.0-0.rc0.git3.1
 - Linux v3.3-7919-g6658a69
 
diff --git a/mod-extra.list b/mod-extra.list
index b670e836c..2e35a12f7 100644
--- a/mod-extra.list
+++ b/mod-extra.list
@@ -155,8 +155,6 @@ sysv.ko
 ufs.ko
 ncpfs.ko
 coda.ko
-9p.ko
-9pnet.ko
 act200l-sir.ko
 ali-ircc.ko
 esi-sir.ko
diff --git a/nx-emu-remove-cpuinitdata-for-disable_nx-on-x86_32.patch b/nx-emu-remove-cpuinitdata-for-disable_nx-on-x86_32.patch
new file mode 100644
index 000000000..38c96caed
--- /dev/null
+++ b/nx-emu-remove-cpuinitdata-for-disable_nx-on-x86_32.patch
@@ -0,0 +1,47 @@
+>From e540f21852043a4d8e8cf5e505607909d0ab0f51 Mon Sep 17 00:00:00 2001
+From: Tim Gardner <tim.gardner@canonical.com>
+Date: Thu, 29 Mar 2012 06:21:01 -0600
+Subject: [PATCH] UBUNTU: SAUCE: disable_nx should not be in __cpuinitdata
+ section for X86_32
+
+I noticed a section mismatch warning while building 3.2.0-20.33 for X86_32.
+
+ AR      arch/x86/lib/lib.a
+  LD      vmlinux.o
+  MODPOST vmlinux.o
+WARNING: vmlinux.o(.text+0x187833): Section mismatch in reference from the function load_elf_binary() to the variable .cpuinit.data:disable_nx
+The function load_elf_binary() references
+the variable __cpuinitdata disable_nx.
+This is often because load_elf_binary lacks a __cpuinitdata
+annotation or the annotation of disable_nx is wrong.
+
+load_elf_binary() is definitely called after initialization.
+
+This code was added by 'UBUNTU: ubuntu: nx-emu - i386: NX emulation', so
+this is not an upstream problem.
+
+Reported-by: Tetsuo Handa <from-ubuntu@I-love.SAKURA.ne.jp>
+Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
+---
+ arch/x86/mm/setup_nx.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
+index 90c9eff3..89fd946 100644
+--- a/arch/x86/mm/setup_nx.c
++++ b/arch/x86/mm/setup_nx.c
+@@ -6,7 +6,11 @@
+ #include <asm/pgtable.h>
+ #include <asm/proto.h>
+ 
++#ifdef CONFIG_X86_32
++int disable_nx; /* referenced by load_elf_binary() */
++#else
+ int disable_nx __cpuinitdata;
++#endif
+ 
+ /*
+  * noexec = on|off
+-- 
+1.7.9.1
+