more patches
S.Çağlar Onur [Thu, 29 Apr 2010 18:39:49 +0000 (18:39 +0000)]
linux-2.6-570-tagxid.patch [new file with mode: 0644]
linux-2.6-580-show-proc-virt.patch [new file with mode: 0644]
linux-2.6-640-netlink-audit-hack.patch [new file with mode: 0644]
linux-2.6-650-hangcheck-reboot.patch [new file with mode: 0644]
linux-2.6-660-nmi-watchdog-default.patch [new file with mode: 0644]
linux-2.6-680-htb-hysteresis-tso.patch [new file with mode: 0644]

diff --git a/linux-2.6-570-tagxid.patch b/linux-2.6-570-tagxid.patch
new file mode 100644 (file)
index 0000000..7a0ec93
--- /dev/null
@@ -0,0 +1,48 @@
+diff --git a/fs/ext2/super.c b/fs/ext2/super.c
+index 4e77a8d..761112e 100644
+--- a/fs/ext2/super.c
++++ b/fs/ext2/super.c
+@@ -412,6 +412,7 @@ static const match_table_t tokens = {
+       {Opt_noacl, "noacl"},
+       {Opt_xip, "xip"},
+       {Opt_tag, "tag"},
++      {Opt_tag, "tagxid"},
+       {Opt_notag, "notag"},
+       {Opt_tagid, "tagid=%u"},
+       {Opt_grpquota, "grpquota"},
+diff --git a/fs/ext3/super.c b/fs/ext3/super.c
+index bb3eccb..8cac842 100644
+--- a/fs/ext3/super.c
++++ b/fs/ext3/super.c
+@@ -857,6 +857,7 @@ static const match_table_t tokens = {
+       {Opt_barrier, "barrier=%u"},
+       {Opt_resize, "resize"},
+       {Opt_tag, "tag"},
++      {Opt_tag, "tagxid"},
+       {Opt_notag, "notag"},
+       {Opt_tagid, "tagid=%u"},
+       {Opt_err, NULL},
+diff --git a/fs/ext4/super.c b/fs/ext4/super.c
+index 8fca488..fb00364 100644
+--- a/fs/ext4/super.c
++++ b/fs/ext4/super.c
+@@ -1179,6 +1179,7 @@ static const match_table_t tokens = {
+       {Opt_discard, "discard"},
+       {Opt_nodiscard, "nodiscard"},
+       {Opt_tag, "tag"},
++      {Opt_tag, "tagxid"},
+       {Opt_notag, "notag"},
+       {Opt_tagid, "tagid=%u"},
+       {Opt_err, NULL},
+diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
+index fa2baad..e28e02f 100644
+--- a/fs/ocfs2/super.c
++++ b/fs/ocfs2/super.c
+@@ -201,6 +201,7 @@ static const match_table_t tokens = {
+       {Opt_usrquota, "usrquota"},
+       {Opt_grpquota, "grpquota"},
+       {Opt_tag, "tag"},
++      {Opt_tag, "tagxid"},
+       {Opt_notag, "notag"},
+       {Opt_tagid, "tagid=%u"},
+       {Opt_err, NULL}
diff --git a/linux-2.6-580-show-proc-virt.patch b/linux-2.6-580-show-proc-virt.patch
new file mode 100644 (file)
index 0000000..d55a7e9
--- /dev/null
@@ -0,0 +1,26 @@
+diff --git a/kernel/vserver/context.c b/kernel/vserver/context.c
+index 4b49403..b0e2bd4 100644
+--- a/kernel/vserver/context.c
++++ b/kernel/vserver/context.c
+@@ -433,7 +433,7 @@ int get_xid_list(int index, unsigned int *xids, int size)
+       int hindex, nr_xids = 0;
+       /* only show current and children */
+-      if (!vx_check(0, VS_ADMIN | VS_WATCH)) {
++      if (!vx_check(0, VS_ADMIN | VS_WATCH) && vx_flags(VXF_HIDE_VINFO, 0)) {
+               if (index > 0)
+                       return 0;
+               xids[nr_xids] = vx_current_xid();
+diff --git a/kernel/vserver/network.c b/kernel/vserver/network.c
+index 3f5a766..a374522 100644
+--- a/kernel/vserver/network.c
++++ b/kernel/vserver/network.c
+@@ -392,7 +392,7 @@ int get_nid_list(int index, unsigned int *nids, int size)
+       int hindex, nr_nids = 0;
+       /* only show current and children */
+-      if (!nx_check(0, VS_ADMIN | VS_WATCH)) {
++      if (!nx_check(0, VS_ADMIN | VS_WATCH) && vx_flags(VXF_HIDE_VINFO, 0)) {
+               if (index > 0)
+                       return 0;
+               nids[nr_nids] = nx_current_nid();
diff --git a/linux-2.6-640-netlink-audit-hack.patch b/linux-2.6-640-netlink-audit-hack.patch
new file mode 100644 (file)
index 0000000..492971f
--- /dev/null
@@ -0,0 +1,16 @@
+diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
+index 1438a1d..ce66270 100644
+--- a/net/netlink/af_netlink.c
++++ b/net/netlink/af_netlink.c
+@@ -447,6 +447,11 @@ static int netlink_create(struct net *net, struct socket *sock, int protocol,
+       if (protocol < 0 || protocol >= MAX_LINKS)
+               return -EPROTONOSUPPORT;
++#ifndef CONFIG_AUDIT
++      if (protocol == NETLINK_AUDIT)
++              return -EPROTONOSUPPORT;
++#endif
++
+       netlink_lock_table();
+ #ifdef CONFIG_MODULES
+       if (!nl_table[protocol].registered) {
diff --git a/linux-2.6-650-hangcheck-reboot.patch b/linux-2.6-650-hangcheck-reboot.patch
new file mode 100644 (file)
index 0000000..a44af4f
--- /dev/null
@@ -0,0 +1,24 @@
+diff --git a/drivers/char/hangcheck-timer.c b/drivers/char/hangcheck-timer.c
+index 712d9f2..054c4df 100644
+--- a/drivers/char/hangcheck-timer.c
++++ b/drivers/char/hangcheck-timer.c
+@@ -57,7 +57,7 @@
+ static int hangcheck_tick = DEFAULT_IOFENCE_TICK;
+ static int hangcheck_margin = DEFAULT_IOFENCE_MARGIN;
+-static int hangcheck_reboot;  /* Defaults to not reboot */
++static int hangcheck_reboot = 1;  /* Defaults to reboot */
+ static int hangcheck_dump_tasks;  /* Defaults to not dumping SysRQ T */
+ /* options - modular */
+@@ -175,8 +175,8 @@ static void hangcheck_fire(unsigned long data)
+ static int __init hangcheck_init(void)
+ {
+-      printk("Hangcheck: starting hangcheck timer %s (tick is %d seconds, margin is %d seconds).\n",
+-             VERSION_STR, hangcheck_tick, hangcheck_margin);
++      printk("Hangcheck: starting hangcheck timer %s (tick is %d seconds, margin is %d seconds, reboot is %d).\n",
++             VERSION_STR, hangcheck_tick, hangcheck_margin, hangcheck_reboot);
+ #if defined (HAVE_MONOTONIC)
+       printk("Hangcheck: Using monotonic_clock().\n");
+ #else
diff --git a/linux-2.6-660-nmi-watchdog-default.patch b/linux-2.6-660-nmi-watchdog-default.patch
new file mode 100644 (file)
index 0000000..fa83c09
--- /dev/null
@@ -0,0 +1,13 @@
+diff --git a/arch/x86/kernel/apic/nmi.c b/arch/x86/kernel/apic/nmi.c
+index ba10ae1..d3bbb92 100644
+--- a/arch/x86/kernel/apic/nmi.c
++++ b/arch/x86/kernel/apic/nmi.c
+@@ -53,7 +53,7 @@ EXPORT_SYMBOL(nmi_active);
+ #ifdef CONFIG_X86_64
+ unsigned int nmi_watchdog = NMI_DEFAULT;
+ #else
+-unsigned int nmi_watchdog = NMI_NONE;
++unsigned int nmi_watchdog = NMI_IO_APIC;
+ #endif
+ EXPORT_SYMBOL(nmi_watchdog);
diff --git a/linux-2.6-680-htb-hysteresis-tso.patch b/linux-2.6-680-htb-hysteresis-tso.patch
new file mode 100644 (file)
index 0000000..b6df6f2
--- /dev/null
@@ -0,0 +1,13 @@
+diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
+index 85acab9..2de93ee 100644
+--- a/net/sched/sch_htb.c
++++ b/net/sched/sch_htb.c
+@@ -52,7 +52,7 @@
+     one less than their parent.
+ */
+-static int htb_hysteresis __read_mostly = 0; /* whether to use mode hysteresis for speedup */
++static int htb_hysteresis __read_mostly = 1; /* whether to use mode hysteresis for speedup */
+ #define HTB_VER 0x30011               /* major must be matched with number suplied by TC as version */
+ #if HTB_VER >> 16 != TC_HTB_PROTOVER