forked from rpms/kernel
		
	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
							
								
									3c2fcd2b19
								
							
						
					
					
						commit
						c39b72eeb3
					
				| @ -127,6 +127,7 @@ CONFIG_ARM_ERRATA_720789=y | |||||||
| # CONFIG_ARM_ERRATA_753970 is not set | # CONFIG_ARM_ERRATA_753970 is not set | ||||||
| # CONFIG_ARM_ERRATA_754322 is not set | # CONFIG_ARM_ERRATA_754322 is not set | ||||||
| # CONFIG_ARM_ERRATA_754327 is not set | # CONFIG_ARM_ERRATA_754327 is not set | ||||||
|  | # CONFIG_ARM_ERRATA_764369 is not set | ||||||
| CONFIG_ARM_GIC=y | CONFIG_ARM_GIC=y | ||||||
| # CONFIG_PCI_SYSCALL is not set | # CONFIG_PCI_SYSCALL is not set | ||||||
| # CONFIG_PCCARD is not set | # CONFIG_PCCARD is not set | ||||||
|  | |||||||
| @ -6,7 +6,6 @@ CONFIG_MACH_TRIMSLICE=y | |||||||
| CONFIG_MACH_WARIO=y | CONFIG_MACH_WARIO=y | ||||||
| CONFIG_MACH_TEGRA_DT=y | CONFIG_MACH_TEGRA_DT=y | ||||||
| CONFIG_TEGRA_DEBUG_UARTD=y | CONFIG_TEGRA_DEBUG_UARTD=y | ||||||
| CONFIG_ARM_ERRATA_742230=y |  | ||||||
| CONFIG_NO_HZ=y | CONFIG_NO_HZ=y | ||||||
| CONFIG_HIGH_RES_TIMERS=y | CONFIG_HIGH_RES_TIMERS=y | ||||||
| CONFIG_SMP=y | CONFIG_SMP=y | ||||||
| @ -32,6 +31,7 @@ CONFIG_CACHE_L2X0=y | |||||||
| CONFIG_ARM_ERRATA_430973=y | CONFIG_ARM_ERRATA_430973=y | ||||||
| # CONFIG_ARM_ERRATA_458693 is not set | # CONFIG_ARM_ERRATA_458693 is not set | ||||||
| # CONFIG_ARM_ERRATA_460075 is not set | # CONFIG_ARM_ERRATA_460075 is not set | ||||||
|  | CONFIG_ARM_ERRATA_742230=y | ||||||
| # CONFIG_ARM_ERRATA_742231 is not set | # CONFIG_ARM_ERRATA_742231 is not set | ||||||
| CONFIG_PL310_ERRATA_588369=y | CONFIG_PL310_ERRATA_588369=y | ||||||
| CONFIG_ARM_ERRATA_720789=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_753970 is not set | ||||||
| # CONFIG_ARM_ERRATA_754322 is not set | # CONFIG_ARM_ERRATA_754322 is not set | ||||||
| # CONFIG_ARM_ERRATA_754327 is not set | # CONFIG_ARM_ERRATA_754327 is not set | ||||||
|  | # CONFIG_ARM_ERRATA_764369 is not set | ||||||
| CONFIG_SMP_ON_UP=y | CONFIG_SMP_ON_UP=y | ||||||
| CONFIG_LOCAL_TIMERS=y | CONFIG_LOCAL_TIMERS=y | ||||||
| # CONFIG_THUMB2_KERNEL is not set | # CONFIG_THUMB2_KERNEL is not set | ||||||
|  | |||||||
| @ -51,7 +51,7 @@ Summary: The Linux kernel | |||||||
| # For non-released -rc kernels, this will be prepended with "0.", so | # For non-released -rc kernels, this will be prepended with "0.", so | ||||||
| # for example a 3 here will become 0.3 | # for example a 3 here will become 0.3 | ||||||
| # | # | ||||||
| %global baserelease 2 | %global baserelease 0 | ||||||
| %global fedora_build %{baserelease} | %global fedora_build %{baserelease} | ||||||
| 
 | 
 | ||||||
| # base_sublevel is the kernel version we're starting with and patching | # base_sublevel is the kernel version we're starting with and patching | ||||||
| @ -82,7 +82,7 @@ Summary: The Linux kernel | |||||||
| # The next upstream release sublevel (base_sublevel+1) | # The next upstream release sublevel (base_sublevel+1) | ||||||
| %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) | %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) | ||||||
| # The rc snapshot level | # The rc snapshot level | ||||||
| %define rcrev 7 | %define rcrev 8 | ||||||
| # The git snapshot level | # The git snapshot level | ||||||
| %define gitrev 0 | %define gitrev 0 | ||||||
| # Set rpm version accordingly | # Set rpm version accordingly | ||||||
| @ -2051,6 +2051,11 @@ fi | |||||||
| #                 ||----w | | #                 ||----w | | ||||||
| #                 ||     || | #                 ||     || | ||||||
| %changelog | %changelog | ||||||
|  | * Tue Sep 27 2011 Chuck Ebbert <cebbert@redhat.com> | ||||||
|  | - 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> | * Thu Sep 22 2011 Dave Jones <davej@redhat.com> | ||||||
| - Make CONFIG_XEN_PLATFORM_PCI=y (rhbz 740664) | - Make CONFIG_XEN_PLATFORM_PCI=y (rhbz 740664) | ||||||
| 
 | 
 | ||||||
|  | |||||||
							
								
								
									
										2
									
								
								sources
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								sources
									
									
									
									
									
								
							| @ -1,2 +1,2 @@ | |||||||
| 398e95866794def22b12dfbc15ce89c0  linux-3.0.tar.bz2 | 398e95866794def22b12dfbc15ce89c0  linux-3.0.tar.bz2 | ||||||
| 39d993cb8e337a037e9e703b82223cec  patch-3.1-rc7.bz2 | aae4a0422f4be618fcdbf4bf9de67143  patch-3.1-rc8.bz2 | ||||||
|  | |||||||
| @ -5168,14 +5168,14 @@ index 4194664..1a50090 100644 | |||||||
|  		unlock_task_sighand(child, &flags); |  		unlock_task_sighand(child, &flags); | ||||||
|  		ret = 0; |  		ret = 0; | ||||||
| @@ -760,7 +772,7 @@ int ptrace_request(struct task_struct *child, long request,
 | @@ -760,7 +772,7 @@ int ptrace_request(struct task_struct *child, long request,
 | ||||||
|  		 * of this trap and now.  Trigger re-trap immediately. |  			 * start of this trap and now.  Trigger re-trap. | ||||||
|  			 */ |  			 */ | ||||||
|  			if (child->jobctl & JOBCTL_TRAP_NOTIFY) |  			if (child->jobctl & JOBCTL_TRAP_NOTIFY) | ||||||
| -				signal_wake_up(child, true);
 | -				signal_wake_up(child, true);
 | ||||||
| +				ptrace_signal_wake_up(child, true);
 | +				ptrace_signal_wake_up(child, true);
 | ||||||
|   |  | ||||||
|  		unlock_task_sighand(child, &flags); |  | ||||||
|  			ret = 0; |  			ret = 0; | ||||||
|  |  		} | ||||||
|  |  		unlock_task_sighand(child, &flags); | ||||||
| diff --git a/kernel/signal.c b/kernel/signal.c
 | diff --git a/kernel/signal.c b/kernel/signal.c
 | ||||||
| index 3e8e0b1..0dc6abb 100644
 | index 3e8e0b1..0dc6abb 100644
 | ||||||
| --- a/kernel/signal.c
 | --- a/kernel/signal.c
 | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user