Linux 3.1-rc8
New option: CONFIG_ARM_ERRATA_764369 is not set Fix up utrace.patch to apply after commit f9d81f61c
This commit is contained in:
parent
94601c03ce
commit
bfd16e3858
|
@ -127,6 +127,7 @@ CONFIG_ARM_ERRATA_720789=y
|
|||
# CONFIG_ARM_ERRATA_753970 is not set
|
||||
# CONFIG_ARM_ERRATA_754322 is not set
|
||||
# CONFIG_ARM_ERRATA_754327 is not set
|
||||
# CONFIG_ARM_ERRATA_764369 is not set
|
||||
CONFIG_ARM_GIC=y
|
||||
# CONFIG_PCI_SYSCALL is not set
|
||||
# CONFIG_PCCARD is not set
|
||||
|
|
|
@ -6,7 +6,6 @@ CONFIG_MACH_TRIMSLICE=y
|
|||
CONFIG_MACH_WARIO=y
|
||||
CONFIG_MACH_TEGRA_DT=y
|
||||
CONFIG_TEGRA_DEBUG_UARTD=y
|
||||
CONFIG_ARM_ERRATA_742230=y
|
||||
CONFIG_NO_HZ=y
|
||||
CONFIG_HIGH_RES_TIMERS=y
|
||||
CONFIG_SMP=y
|
||||
|
@ -32,6 +31,7 @@ CONFIG_CACHE_L2X0=y
|
|||
CONFIG_ARM_ERRATA_430973=y
|
||||
# CONFIG_ARM_ERRATA_458693 is not set
|
||||
# CONFIG_ARM_ERRATA_460075 is not set
|
||||
CONFIG_ARM_ERRATA_742230=y
|
||||
# CONFIG_ARM_ERRATA_742231 is not set
|
||||
CONFIG_PL310_ERRATA_588369=y
|
||||
CONFIG_ARM_ERRATA_720789=y
|
||||
|
@ -41,6 +41,7 @@ CONFIG_ARM_ERRATA_720789=y
|
|||
# CONFIG_ARM_ERRATA_753970 is not set
|
||||
# CONFIG_ARM_ERRATA_754322 is not set
|
||||
# CONFIG_ARM_ERRATA_754327 is not set
|
||||
# CONFIG_ARM_ERRATA_764369 is not set
|
||||
CONFIG_SMP_ON_UP=y
|
||||
CONFIG_LOCAL_TIMERS=y
|
||||
# CONFIG_THUMB2_KERNEL is not set
|
||||
|
|
|
@ -82,7 +82,7 @@ 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 7
|
||||
%define rcrev 8
|
||||
# The git snapshot level
|
||||
%define gitrev 0
|
||||
# Set rpm version accordingly
|
||||
|
@ -2053,6 +2053,11 @@ fi
|
|||
# and build.
|
||||
|
||||
%changelog
|
||||
* Tue Sep 27 2011 Chuck Ebbert <cebbert@redhat.com> 3.1.0-0.rc8.git0.0
|
||||
- Linux 3.1-rc8
|
||||
- New option: CONFIG_ARM_ERRATA_764369 is not set
|
||||
- Fix up utrace.patch to apply after commit f9d81f61c
|
||||
|
||||
* Thu Sep 22 2011 Dave Jones <davej@redhat.com>
|
||||
- Make CONFIG_XEN_PLATFORM_PCI=y (rhbz 740664)
|
||||
|
||||
|
|
14
utrace.patch
14
utrace.patch
|
@ -5168,14 +5168,14 @@ index 4194664..1a50090 100644
|
|||
unlock_task_sighand(child, &flags);
|
||||
ret = 0;
|
||||
@@ -760,7 +772,7 @@ int ptrace_request(struct task_struct *child, long request,
|
||||
* of this trap and now. Trigger re-trap immediately.
|
||||
*/
|
||||
if (child->jobctl & JOBCTL_TRAP_NOTIFY)
|
||||
- signal_wake_up(child, true);
|
||||
+ ptrace_signal_wake_up(child, true);
|
||||
|
||||
* start of this trap and now. Trigger re-trap.
|
||||
*/
|
||||
if (child->jobctl & JOBCTL_TRAP_NOTIFY)
|
||||
- signal_wake_up(child, true);
|
||||
+ ptrace_signal_wake_up(child, true);
|
||||
ret = 0;
|
||||
}
|
||||
unlock_task_sighand(child, &flags);
|
||||
ret = 0;
|
||||
diff --git a/kernel/signal.c b/kernel/signal.c
|
||||
index 3e8e0b1..0dc6abb 100644
|
||||
--- a/kernel/signal.c
|
||||
|
|
Loading…
Reference in New Issue