[kernel: 1/3] linux 3.4-rc1

Mon Apr 2 21:01:34 UTC 2012

commit d8c9baa9103001162859031f9cb6a39eb39f9695
Author: Justin M. Forbes <jforbes at redhat.com>
Date:   Mon Apr 2 15:44:23 2012 -0500

    linux 3.4-rc1

 ...CA-Fix-regression-in-FADT-revision-checks.patch |   58 --------
 acpi-ensure-thermal-limits-match-cpu-freq.patch    |  146 --------------------
 config-generic                                     |    2 +-
 kernel.spec                                        |   20 ++--
 linux-2.6-acpi-debug-infinite-loop.patch           |    4 +-
 linux-2.6-compile-fixes.patch                      |   39 -----
 linux-2.6-i386-nx-emulation.patch                  |   11 +-
 sources                                            |    2 +-
 8 files changed, 19 insertions(+), 263 deletions(-)
---

diff --git a/config-generic b/config-generic
index 685bd1c..f900d91 100644
--- a/config-generic
+++ b/config-generic
@@ -39,7 +39,7 @@ CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_SYSCTL=y
-CONFIG_LOG_BUF_SHIFT=17
+CONFIG_LOG_BUF_SHIFT=18
 # CONFIG_IKCONFIG is not set
 # CONFIG_EMBEDDED is not set
 # CONFIG_EXPERT is not set
diff --git a/kernel.spec b/kernel.spec
index b4cff0f..47297e1 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 2
+%global baserelease 1
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -93,9 +93,9 @@ Summary: The Linux kernel
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%define rcrev 0
+%define rcrev 1
 # The git snapshot level
-%define gitrev 4
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -657,7 +657,6 @@ 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
 Patch394: linux-2.6-acpi-debug-infinite-loop.patch
-Patch395: acpi-ensure-thermal-limits-match-cpu-freq.patch
 Patch396: acpi-sony-nonvs-blacklist.patch
 
 Patch450: linux-2.6-input-kill-stupid-messages.patch
@@ -733,9 +732,6 @@ Patch21235: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
 
 Patch21260: x86-Avoid-invoking-RCU-when-CPU-is-idle.patch
 
-#rhbz 727865 730007
-Patch21300: ACPICA-Fix-regression-in-FADT-revision-checks.patch
-
 #rhbz 804007
 Patch21305: mac80211-fix-possible-tid_rx-reorder_timer-use-after-free.patch
 
@@ -1331,7 +1327,6 @@ ApplyPatch arm-tegra-nvec-kconfig.patch
 ApplyPatch linux-2.6-defaults-acpi-video.patch
 ApplyPatch linux-2.6-acpi-video-dos.patch
 ApplyPatch linux-2.6-acpi-debug-infinite-loop.patch
-ApplyPatch acpi-ensure-thermal-limits-match-cpu-freq.patch
 ApplyPatch acpi-sony-nonvs-blacklist.patch
 
 #
@@ -1422,9 +1417,6 @@ ApplyPatch power-x86-destdir.patch
 #rhbz 754518
 ApplyPatch scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
 
-#rhbz 727865 730007
-ApplyPatch ACPICA-Fix-regression-in-FADT-revision-checks.patch
-
 #rhbz 804007
 ApplyPatch mac80211-fix-possible-tid_rx-reorder_timer-use-after-free.patch
 
@@ -2291,6 +2283,12 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Mon Apr 02 2012 Justin M. Forbes <jforbes at redhat.com> - 3.4.0-0.rc1
+- Linux v3.4-rc1
+
+* Fri Mar 30 2012 Justin M. Forbes <jforbes at redhat.com> - 3.4.0-0.rc0.git5.1
+- Linux v3.3-9295-gf52b69f
+
 * Thu Mar 29 2012 Justin M. Forbes <jforbes at redhat.com> - 3.4.0-0.rc0.git4.1
 - Linux v3.3-8839-gb5174fa
 
diff --git a/linux-2.6-acpi-debug-infinite-loop.patch b/linux-2.6-acpi-debug-infinite-loop.patch
index d200252..f2cc1a5 100644
--- a/linux-2.6-acpi-debug-infinite-loop.patch
+++ b/linux-2.6-acpi-debug-infinite-loop.patch
@@ -1,5 +1,5 @@
---- linux-2.6.34.noarch/drivers/acpi/acpica/acconfig.h~	2010-07-01 14:49:03.000000000 -0400
-+++ linux-2.6.34.noarch/drivers/acpi/acpica/acconfig.h	2010-07-01 14:49:17.000000000 -0400
+--- linux-2.6.34.noarch/include/acpi/acconfig.h~	2010-07-01 14:49:03.000000000 -0400
++++ linux-2.6.34.noarch/include/acpi/acconfig.h		2010-07-01 14:49:17.000000000 -0400
 @@ -117,7 +117,7 @@
  
  /* Maximum number of While() loop iterations before forced abort */
diff --git a/linux-2.6-compile-fixes.patch b/linux-2.6-compile-fixes.patch
index c0d5082..34c08ce 100644
--- a/linux-2.6-compile-fixes.patch
+++ b/linux-2.6-compile-fixes.patch
@@ -4,42 +4,3 @@
 # Please add the errors from gcc before the diffs to save others having
 # to do a compile to figure out what your diff is fixing. Thanks.
 #
-# ../../lib/rbtree.c:24:26: fatal error: linux/export.h: No such file or directory
-diff --git a/tools/perf/Makefile b/tools/perf/Makefile
-index b492e3a..2f42886 100644
---- a/tools/perf/Makefile
-+++ b/tools/perf/Makefile
-@@ -251,7 +251,7 @@ LIB_H += util/include/linux/const.h
- LIB_H += util/include/linux/ctype.h
- LIB_H += util/include/linux/kernel.h
- LIB_H += util/include/linux/list.h
--LIB_H += util/include/linux/module.h
-+LIB_H += util/include/linux/export.h
- LIB_H += util/include/linux/poison.h
- LIB_H += util/include/linux/prefetch.h
- LIB_H += util/include/linux/rbtree.h
-diff --git a/tools/perf/util/include/linux/export.h b/tools/perf/util/include/linux/export.h
-new file mode 100644
-index 0000000..b43e2dc
---- /dev/null
-+++ b/tools/perf/util/include/linux/export.h
-@@ -0,0 +1,6 @@
-+#ifndef PERF_LINUX_MODULE_H
-+#define PERF_LINUX_MODULE_H
-+
-+#define EXPORT_SYMBOL(name)
-+
-+#endif
-diff --git a/tools/perf/util/include/linux/module.h b/tools/perf/util/include/linux/module.h
-deleted file mode 100644
-index b43e2dc..0000000
---- a/tools/perf/util/include/linux/module.h
-+++ /dev/null
-@@ -1,6 +0,0 @@
--#ifndef PERF_LINUX_MODULE_H
--#define PERF_LINUX_MODULE_H
--
--#define EXPORT_SYMBOL(name)
--
--#endif
--- 
diff --git a/linux-2.6-i386-nx-emulation.patch b/linux-2.6-i386-nx-emulation.patch
index 565d616..8a7fe7a 100644
--- a/linux-2.6-i386-nx-emulation.patch
+++ b/linux-2.6-i386-nx-emulation.patch
@@ -333,9 +333,9 @@ index 4d42300..4cb14a1 100644
 +#endif /*CONFIG_X86_32*/
 +
  	tsk->thread.error_code = error_code;
- 	tsk->thread.trap_no = 13;
+ 	tsk->thread.trap_nr = X86_TRAP_GP;
  
-@@ -650,19 +745,37 @@ do_device_not_available(struct pt_regs *regs, long error_code)
+@@ -650,20 +745,37 @@ do_device_not_available(struct pt_regs *regs, long error_code)
  }
  
  #ifdef CONFIG_X86_32
@@ -362,10 +362,11 @@ index 4d42300..4cb14a1 100644
 -	info.si_errno = 0;
 -	info.si_code = ILL_BADSTK;
 -	info.si_addr = NULL;
--	if (notify_die(DIE_TRAP, "iret exception",
--			regs, error_code, 32, SIGILL) == NOTIFY_STOP)
+-	if (notify_die(DIE_TRAP, "iret exception", regs, error_code,
+-			X86_TRAP_IRET, SIGILL) == NOTIFY_STOP)
 -		return;
--	do_trap(32, SIGILL, "iret exception", regs, error_code, &info);
+-	do_trap(X86_TRAP_IRET, SIGILL, "iret exception", regs, error_code,
+-		&info);
 +	cpu = get_cpu();
 +	ok = check_lazy_exec_limit(cpu, regs, error_code);
 +	put_cpu();
diff --git a/sources b/sources
index d6db52e..3d94ea5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 7133f5a2086a7d7ef97abac610c094f5  linux-3.3.tar.xz
-60c207c091e934060815826dc6ea08da  patch-3.3-git4.xz
+ffba5507a7cc555cdbdac58842481d36  patch-3.4-rc1.xz
