Author: arekm Date: Fri Nov 11 21:50:37 2011 GMT
Module: packages Tag: LINUX_3_0
---- Log message:
- up to 3.0.9
---- Files affected:
packages/kernel:
kernel-grsec_full.patch (1.85 -> 1.85.2.1) , kernel-multiarch.config (1.77
-> 1.77.2.1) , kernel-vserver-2.3.patch (1.83.2.1 -> 1.83.2.2) , kernel.spec
(1.987.2.3 -> 1.987.2.4) , kernel-radeon-hp-fix.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/kernel/kernel-grsec_full.patch
diff -u packages/kernel/kernel-grsec_full.patch:1.85
packages/kernel/kernel-grsec_full.patch:1.85.2.1
--- packages/kernel/kernel-grsec_full.patch:1.85 Sun Oct 23 13:51:09 2011
+++ packages/kernel/kernel-grsec_full.patch Fri Nov 11 22:50:30 2011
@@ -60605,9 +60605,9 @@
--- linux-3.0.7/include/linux/vmalloc.h 2011-07-21 22:17:23.000000000
-0400
+++ linux-3.0.7/include/linux/vmalloc.h 2011-08-23 21:47:56.000000000
-0400
@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining
- #define VM_MAP 0x00000004 /* vmap()ed pages */
#define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
#define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
+ #define VM_UNLIST 0x00000020 /* vm_struct is not listed in vmlist */
+
+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) &&
defined(CONFIG_PAX_KERNEXEC)
+#define VM_KERNEXEC 0x00000020 /* allocate from executable kernel
memory range */
@@ -70828,13 +70828,13 @@
+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) &&
defined(CONFIG_PAX_KERNEXEC)
+ if (!(pgprot_val(prot) & _PAGE_NX))
-+ area = __get_vm_area_node(size, align, VM_ALLOC | VM_KERNEXEC,
VMALLOC_START, VMALLOC_END,
++ area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST |
VM_KERNEXEC, VMALLOC_START, VMALLOC_END,
+ node, gfp_mask, caller);
+ else
+#endif
+
- area = __get_vm_area_node(size, align, VM_ALLOC, start, end, node,
- gfp_mask, caller);
+ area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST,
+ start, end, node, gfp_mask, caller);
@@ -1655,6 +1717,7 @@ static void *__vmalloc_node(unsigned lon
gfp_mask, prot, node, caller);
@@ -73637,7 +73637,7 @@
diff -urNp linux-3.0.7/net/packet/af_packet.c
linux-3.0.7/net/packet/af_packet.c
--- linux-3.0.7/net/packet/af_packet.c 2011-07-21 22:17:23.000000000 -0400
+++ linux-3.0.7/net/packet/af_packet.c 2011-08-23 21:47:56.000000000 -0400
-@@ -647,14 +647,14 @@ static int packet_rcv(struct sk_buff *sk
+@@ -647,7 +647,7 @@ static int packet_rcv(struct sk_buff *sk
spin_lock(&sk->sk_receive_queue.lock);
po->stats.tp_packets++;
@@ -73646,14 +73646,15 @@
__skb_queue_tail(&sk->sk_receive_queue, skb);
spin_unlock(&sk->sk_receive_queue.lock);
sk->sk_data_ready(sk, skb->len);
- return 0;
-
+@@ -656,7 +656,7 @@ static int packet_rcv(struct sk_buff *sk
drop_n_acct:
-- po->stats.tp_drops = atomic_inc_return(&sk->sk_drops);
-+ po->stats.tp_drops = atomic_inc_return_unchecked(&sk->sk_drops);
+ spin_lock(&sk->sk_receive_queue.lock);
+ po->stats.tp_drops++;
+- atomic_inc(&sk->sk_drops);
++ atomic_inc_return_unchecked(&sk->sk_drops);
+ spin_unlock(&sk->sk_receive_queue.lock);
drop_n_restore:
- if (skb_head != skb->data && skb_shared(skb)) {
@@ -2168,7 +2168,7 @@ static int packet_getsockopt(struct sock
case PACKET_HDRLEN:
if (len > sizeof(int))
================================================================
Index: packages/kernel/kernel-multiarch.config
diff -u packages/kernel/kernel-multiarch.config:1.77
packages/kernel/kernel-multiarch.config:1.77.2.1
--- packages/kernel/kernel-multiarch.config:1.77 Thu Oct 6 17:09:43 2011
+++ packages/kernel/kernel-multiarch.config Fri Nov 11 22:50:30 2011
@@ -766,7 +766,7 @@
#- file drivers/hid/usbhid/Kconfig goes here
HID_A4TECH all=m
HID_ACRUX all=m
-HID_ACRUX_FF all=m
+HID_ACRUX_FF all=y
HID_APPLE all=m
HID_BELKIN all=m
HID_CHERRY all=m
================================================================
Index: packages/kernel/kernel-vserver-2.3.patch
diff -u packages/kernel/kernel-vserver-2.3.patch:1.83.2.1
packages/kernel/kernel-vserver-2.3.patch:1.83.2.2
--- packages/kernel/kernel-vserver-2.3.patch:1.83.2.1 Thu Nov 10 08:42:59 2011
+++ packages/kernel/kernel-vserver-2.3.patch Fri Nov 11 22:50:31 2011
@@ -7034,12 +7034,13 @@
seq_printf(m, "%i %i %u:%u ", mnt->mnt_id, mnt->mnt_parent->mnt_id,
MAJOR(sb->s_dev), MINOR(sb->s_dev));
if (sb->s_op->show_path)
-@@ -1107,21 +1159,31 @@ static int show_vfsstat(struct seq_file
+@@ -1107,22 +1159,32 @@ static int show_vfsstat(struct seq_file
struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };
int err = 0;
- /* device */
- if (mnt->mnt_sb->s_op->show_devname) {
+- seq_puts(m, "device ");
- err = mnt->mnt_sb->s_op->show_devname(m, mnt);
+ if (vx_flags(VXF_HIDE_MOUNT, 0))
+ return SEQ_SKIP;
@@ -7058,6 +7059,7 @@
- }
+ /* device */
+ if (mnt->mnt_sb->s_op->show_devname) {
++ seq_puts(m, "device ");
+ err = mnt->mnt_sb->s_op->show_devname(m, mnt);
+ } else {
+ if (mnt->mnt_devname) {
================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.987.2.3
packages/kernel/kernel.spec:1.987.2.4
--- packages/kernel/kernel.spec:1.987.2.3 Thu Nov 10 08:42:59 2011
+++ packages/kernel/kernel.spec Fri Nov 11 22:50:31 2011
@@ -94,8 +94,8 @@
%endif
%define basever 3.0
-%define postver .8
-%define rel 1.1
+%define postver .9
+%define rel 1
%define _enable_debug_packages 0
@@ -143,7 +143,7 @@
# Source0-md5: ecf932280e2441bdd992423ef3d55f8f
%if "%{postver}" != ".0"
Patch0:
http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
-# Patch0-md5: 49618d8c7a71549c8870eb709c7d3f81
+# Patch0-md5: 0154d21e63d3f14fc1084cdb130fab2d
%endif
Source3: kernel-autoconf.h
@@ -276,7 +276,6 @@
Patch2000: kernel-small_fixes.patch
Patch2001: kernel-pwc-uncompress.patch
Patch2003: kernel-regressions.patch
-Patch2004: kernel-radeon-hp-fix.patch
# 0001-AppArmor-compatibility-patch-for-v5-network-controll.patch
# 0002-AppArmor-compatibility-patch-for-v5-interface.patch
@@ -797,7 +796,6 @@
%patch2000 -p1
%patch2001 -p1
#%patch2003 -p1
-%patch2004 -p1
# Do not remove this, please!
#%patch50000 -p1
@@ -1536,6 +1534,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.987.2.4 2011/11/11 21:50:31 arekm
+- up to 3.0.9
+
Revision 1.987.2.3 2011/11/10 07:42:59 arekm
- rel 1.1; vserver up to patch-3.0.7-vs2.3.1.diff + mnt_is_reachable fix;
grsec up to grsecurity-2.2.2-3.0.8-201110250925.patch; cgroup tight memory
condition bugfix added
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-grsec_full.patch?r1=1.85&r2=1.85.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-multiarch.config?r1=1.77&r2=1.77.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-2.3.patch?r1=1.83.2.1&r2=1.83.2.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.987.2.3&r2=1.987.2.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
