Author: baggins Date: Tue Mar 20 08:00:57 2012 GMT
Module: packages Tag: LINUX_3_0
---- Log message:
- up to 3.0.25
---- Files affected:
packages/kernel:
kernel-grsec_full.patch (1.85.2.9 -> 1.85.2.10) , kernel-vserver-2.3.patch
(1.83.2.12 -> 1.83.2.13) , kernel.spec (1.987.2.40 -> 1.987.2.41)
---- Diffs:
================================================================
Index: packages/kernel/kernel-grsec_full.patch
diff -u packages/kernel/kernel-grsec_full.patch:1.85.2.9
packages/kernel/kernel-grsec_full.patch:1.85.2.10
--- packages/kernel/kernel-grsec_full.patch:1.85.2.9 Fri Feb 3 23:18:43 2012
+++ packages/kernel/kernel-grsec_full.patch Tue Mar 20 09:00:47 2012
@@ -7504,31 +7504,15 @@
/*
* Clear the bytes not touched by the fxsave and reserved
* for the SW usage.
-@@ -213,13 +223,8 @@ static inline void fpu_fxsave(struct fpu
- #endif /* CONFIG_X86_64 */
-
- /* We need a safe address that is cheap to find and that is already
-- in L1 during context switch. The best choices are unfortunately
-- different for UP and SMP */
--#ifdef CONFIG_SMP
--#define safe_address (__per_cpu_offset[0])
--#else
--#define safe_address (kstat_cpu(0).cpustat.user)
--#endif
-+ in L1 during context switch. */
-+#define safe_address (init_tss[smp_processor_id()].x86_tss.sp0)
+@@ -424,7 +434,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
+ static inline bool interrupted_user_mode(void)
+ {
+ struct pt_regs *regs = get_irq_regs();
+- return regs && user_mode_vm(regs);
++ return regs && user_mode(regs);
+ }
/*
- * These must be called with preempt disabled
-@@ -312,7 +317,7 @@ static inline void kernel_fpu_begin(void
- struct thread_info *me = current_thread_info();
- preempt_disable();
- if (me->status & TS_USEDFPU)
-- __save_init_fpu(me->task);
-+ __save_init_fpu(current);
- else
- clts();
- }
diff -urNp linux-3.0.9/arch/x86/include/asm/io.h
linux-3.0.9/arch/x86/include/asm/io.h
--- linux-3.0.9/arch/x86/include/asm/io.h 2011-11-11 13:12:24.000000000
-0500
+++ linux-3.0.9/arch/x86/include/asm/io.h 2011-11-15 20:02:59.000000000
-0500
@@ -14977,7 +14961,7 @@
int cpu = smp_processor_id();
- struct tss_struct *tss = &per_cpu(init_tss, cpu);
+ struct tss_struct *tss = init_tss + cpu;
- bool preload_fpu;
+ fpu_switch_t fpu;
/* never put a printk in __switch_to... printk() calls wake_up*()
indirectly */
@@ -327,6 +328,10 @@ __switch_to(struct task_struct *prev_p,
@@ -14998,9 +14982,9 @@
+ percpu_write(current_task, next_p);
+ percpu_write(current_tinfo, &next_p->tinfo);
+
- if (preload_fpu)
- __math_state_restore();
-
+ /*
+ * Restore %gs if needed (which is common)
+ */
@@ -371,8 +379,6 @@ __switch_to(struct task_struct *prev_p,
if (prev->gs | next->gs)
lazy_load_gs(next->gs);
@@ -16399,25 +16383,17 @@
{
if (!fixup_exception(regs)) {
task->thread.error_code = error_code;
-@@ -723,7 +763,7 @@ asmlinkage void __attribute__((weak)) sm
- void __math_state_restore(void)
- {
- struct thread_info *thread = current_thread_info();
-- struct task_struct *tsk = thread->task;
-+ struct task_struct *tsk = current;
-
- /*
- * Paranoid restore. send a SIGSEGV if we fail to restore the state.
-@@ -750,8 +790,7 @@ void __math_state_restore(void)
- */
- asmlinkage void math_state_restore(void)
+@@ -569,8 +598,8 @@ asmlinkage void __attribute__((weak))
smp_threshold_interrupt(void)
+ void __math_state_restore(struct task_struct *tsk)
{
-- struct thread_info *thread = current_thread_info();
-- struct task_struct *tsk = thread->task;
-+ struct task_struct *tsk = current;
+ /* We need a safe address that is cheap to find and that is already
+- in L1. We've just brought in "tsk->thread.has_fpu", so use that */
+-#define safe_address (tsk->thread.has_fpu)
++ in L1. */
++#define safe_address (init_tss[smp_processor_id()].x86_tss.sp0)
- if (!tsk_used_math(tsk)) {
- local_irq_enable();
+ /* AMD K7/K8 CPUs don't save/restore FDP/FIP/FOP unless an exception
+ is pending. Clear the x87 state here by setting it to fixed
diff -urNp linux-3.0.9/arch/x86/kernel/verify_cpu.S
linux-3.0.9/arch/x86/kernel/verify_cpu.S
--- linux-3.0.9/arch/x86/kernel/verify_cpu.S 2011-11-11 13:12:24.000000000
-0500
+++ linux-3.0.9/arch/x86/kernel/verify_cpu.S 2011-11-15 20:02:59.000000000
-0500
================================================================
Index: packages/kernel/kernel-vserver-2.3.patch
diff -u packages/kernel/kernel-vserver-2.3.patch:1.83.2.12
packages/kernel/kernel-vserver-2.3.patch:1.83.2.13
--- packages/kernel/kernel-vserver-2.3.patch:1.83.2.12 Mon Mar 12 22:14:03 2012
+++ packages/kernel/kernel-vserver-2.3.patch Tue Mar 20 09:00:48 2012
@@ -24610,12 +24610,12 @@
@@ -447,7 +447,7 @@ static struct sk_buff *br_ip6_multicast_
ip6h->hop_limit = 1;
ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1));
- ipv6_dev_get_saddr(dev_net(br->dev), br->dev, &ip6h->daddr, 0,
-- &ip6h->saddr);
-+ &ip6h->saddr, NULL);
- ipv6_eth_mc_map(&ip6h->daddr, eth->h_dest);
-
- hopopt = (u8 *)(ip6h + 1);
+ if (ipv6_dev_get_saddr(dev_net(br->dev), br->dev, &ip6h->daddr, 0,
+- &ip6h->saddr)) {
++ &ip6h->saddr, NULL)) {
+ kfree_skb(skb);
+ return NULL;
+ }
diff -NurpP --minimal linux-3.0.21/net/core/dev.c
linux-3.0.21-vs2.3.2.3/net/core/dev.c
--- linux-3.0.21/net/core/dev.c 2012-02-15 01:04:25.000000000 +0100
+++ linux-3.0.21-vs2.3.2.3/net/core/dev.c 2011-11-15 17:37:07.000000000
+0100
================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.987.2.40
packages/kernel/kernel.spec:1.987.2.41
--- packages/kernel/kernel.spec:1.987.2.40 Mon Mar 12 22:14:04 2012
+++ packages/kernel/kernel.spec Tue Mar 20 09:00:49 2012
@@ -94,8 +94,8 @@
%endif
%define basever 3.0
-%define postver .24
-%define rel 0.1
+%define postver .25
+%define rel 1
%define _enable_debug_packages 0
@@ -141,7 +141,7 @@
# Source0-md5: ecf932280e2441bdd992423ef3d55f8f
%if "%{postver}" != ".0"
Patch0:
http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
-# Patch0-md5: 73500c48851f07c4d8d2ee458cd78108
+# Patch0-md5: de967261cb602aa9dcaa51123ccc1945
%endif
Source3: kernel-autoconf.h
@@ -1550,6 +1550,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.987.2.41 2012/03/20 08:00:49 baggins
+- up to 3.0.25
+
Revision 1.987.2.40 2012/03/12 21:14:04 baggins
- up to 3.0.24
- grsec needs updating
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-grsec_full.patch?r1=1.85.2.9&r2=1.85.2.10&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-2.3.patch?r1=1.83.2.12&r2=1.83.2.13&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.987.2.40&r2=1.987.2.41&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
