| 1 |
pva 08/10/29 15:28:12 |
| 2 |
|
| 3 |
Added: |
| 4 |
openvz-sources-2.6.18.028.056.1-CONFIG_SECCOMP-build.patch |
| 5 |
openvz-sources-2.6.18.028.059.3-e1000-build.patch |
| 6 |
Removed: |
| 7 |
openvz-sources-2.6.18.028.057.2-another-fix-build-xfrm.h.patch |
| 8 |
openvz-sources-2.6.18-ms-splice-access.patch |
| 9 |
openvz-sources-2.6.18.028.057.2-fix-build-xfrm.h.patch |
| 10 |
Log: |
| 11 |
Bumped rhel5 based (~arch) and 2.6.24 kernels. Fixed build issue if CONFIG_SECCOMP is enabled, bug #242728, thank Balazs Nemeth for report. |
| 12 |
(Portage version: 2.2_rc12/cvs/Linux 2.6.26-openvz.git-35f41f1 i686) |
| 13 |
|
| 14 |
Revision Changes Path |
| 15 |
1.1 sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.056.1-CONFIG_SECCOMP-build.patch |
| 16 |
|
| 17 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.056.1-CONFIG_SECCOMP-build.patch?rev=1.1&view=markup |
| 18 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.056.1-CONFIG_SECCOMP-build.patch?rev=1.1&content-type=text/plain |
| 19 |
|
| 20 |
Index: openvz-sources-2.6.18.028.056.1-CONFIG_SECCOMP-build.patch |
| 21 |
=================================================================== |
| 22 |
diff --git a/fs/compat.c b/fs/compat.c |
| 23 |
index 6c4741a..4f983e2 100644 |
| 24 |
--- a/fs/compat.c |
| 25 |
+++ b/fs/compat.c |
| 26 |
@@ -56,6 +56,10 @@ |
| 27 |
#include <asm/mmu_context.h> |
| 28 |
#include <asm/ioctls.h> |
| 29 |
|
| 30 |
+#ifdef CONFIG_QUOTA_COMPAT |
| 31 |
+#include <linux/quota-compat.h> |
| 32 |
+#endif |
| 33 |
+ |
| 34 |
extern void sigset_from_compat(sigset_t *set, compat_sigset_t *compat); |
| 35 |
|
| 36 |
int compat_log = 1; |
| 37 |
diff --git a/fs/quota.c b/fs/quota.c |
| 38 |
index e037b78..ca7a9be 100644 |
| 39 |
--- a/fs/quota.c |
| 40 |
+++ b/fs/quota.c |
| 41 |
@@ -18,6 +18,10 @@ |
| 42 |
#include <linux/capability.h> |
| 43 |
#include <linux/quotaops.h> |
| 44 |
|
| 45 |
+#ifdef CONFIG_QUOTA_COMPAT |
| 46 |
+#include <linux/quota-compat.h> |
| 47 |
+#endif |
| 48 |
+ |
| 49 |
/* Check validity of generic quotactl commands */ |
| 50 |
static int generic_quotactl_valid(struct super_block *sb, int type, int cmd, qid_t id) |
| 51 |
{ |
| 52 |
diff --git a/include/linux/quota-compat.h b/include/linux/quota-compat.h |
| 53 |
new file mode 100644 |
| 54 |
index 0000000..c2f3435 |
| 55 |
--- /dev/null |
| 56 |
+++ b/include/linux/quota-compat.h |
| 57 |
@@ -0,0 +1,60 @@ |
| 58 |
+/* |
| 59 |
+ * include/linux/quota-compat.h |
| 60 |
+ * |
| 61 |
+ * Copyright (C) 2008 SWsoft |
| 62 |
+ * All rights reserved. |
| 63 |
+ * |
| 64 |
+ * Licensing governed by "linux/COPYING.SWsoft" file. |
| 65 |
+ * |
| 66 |
+ */ |
| 67 |
+ |
| 68 |
+#ifndef _LINUX_QUOTA_COMPAT_ |
| 69 |
+#define _LINUX_QUOTA_COMPAT_ |
| 70 |
+ |
| 71 |
+#include <linux/compat.h> |
| 72 |
+ |
| 73 |
+#define QC_QUOTAON 0x0100 /* enable quotas */ |
| 74 |
+#define QC_QUOTAOFF 0x0200 /* disable quotas */ |
| 75 |
+ |
| 76 |
+/* GETQUOTA, SETQUOTA and SETUSE which were at 0x0300-0x0500 has now |
| 77 |
+ * other parameteres |
| 78 |
+ */ |
| 79 |
+#define QC_SYNC 0x0600 /* sync disk copy of a filesystems quotas */ |
| 80 |
+#define QC_SETQLIM 0x0700 /* set limits */ |
| 81 |
+/* GETSTATS at 0x0800 is now longer... */ |
| 82 |
+#define QC_GETINFO 0x0900 /* get info about quotas - graces, flags... */ |
| 83 |
+#define QC_SETINFO 0x0A00 /* set info about quotas */ |
| 84 |
+#define QC_SETGRACE 0x0B00 /* set inode and block grace */ |
| 85 |
+#define QC_SETFLAGS 0x0C00 /* set flags for quota */ |
| 86 |
+#define QC_GETQUOTA 0x0D00 /* get limits and usage */ |
| 87 |
+#define QC_SETQUOTA 0x0E00 /* set limits and usage */ |
| 88 |
+#define QC_SETUSE 0x0F00 /* set usage */ |
| 89 |
+/* 0x1000 used by old RSQUASH */ |
| 90 |
+#define QC_GETSTATS 0x1100 /* get collected stats */ |
| 91 |
+ |
| 92 |
+struct compat_v2_dqblk { |
| 93 |
+ unsigned int dqb_ihardlimit; |
| 94 |
+ unsigned int dqb_isoftlimit; |
| 95 |
+ unsigned int dqb_curinodes; |
| 96 |
+ unsigned int dqb_bhardlimit; |
| 97 |
+ unsigned int dqb_bsoftlimit; |
| 98 |
+ qsize_t dqb_curspace; |
| 99 |
+ __kernel_time_t dqb_btime; |
| 100 |
+ __kernel_time_t dqb_itime; |
| 101 |
+}; |
| 102 |
+ |
| 103 |
+#ifdef CONFIG_COMPAT |
| 104 |
+struct compat_v2_dqblk_32 { |
| 105 |
+ unsigned int dqb_ihardlimit; |
| 106 |
+ unsigned int dqb_isoftlimit; |
| 107 |
+ unsigned int dqb_curinodes; |
| 108 |
+ unsigned int dqb_bhardlimit; |
| 109 |
+ unsigned int dqb_bsoftlimit; |
| 110 |
+ qsize_t dqb_curspace; |
| 111 |
+ compat_time_t dqb_btime; |
| 112 |
+ compat_time_t dqb_itime; |
| 113 |
+} __attribute__ ((packed)); |
| 114 |
+#endif |
| 115 |
+ |
| 116 |
+#endif /* _LINUX_QUOTA_COMPAT_ */ |
| 117 |
+ |
| 118 |
diff --git a/include/linux/quota.h b/include/linux/quota.h |
| 119 |
index c8ae394..55afad9 100644 |
| 120 |
--- a/include/linux/quota.h |
| 121 |
+++ b/include/linux/quota.h |
| 122 |
@@ -321,53 +321,6 @@ int mark_dquot_dirty(struct dquot *dquot); |
| 123 |
int register_quota_format(struct quota_format_type *fmt); |
| 124 |
void unregister_quota_format(struct quota_format_type *fmt); |
| 125 |
|
| 126 |
-#ifdef CONFIG_QUOTA_COMPAT |
| 127 |
-#include <linux/compat.h> |
| 128 |
- |
| 129 |
-#define QC_QUOTAON 0x0100 /* enable quotas */ |
| 130 |
-#define QC_QUOTAOFF 0x0200 /* disable quotas */ |
| 131 |
- |
| 132 |
-/* GETQUOTA, SETQUOTA and SETUSE which were at 0x0300-0x0500 has now |
| 133 |
- * other parameteres |
| 134 |
- */ |
| 135 |
-#define QC_SYNC 0x0600 /* sync disk copy of a filesystems quotas */ |
| 136 |
-#define QC_SETQLIM 0x0700 /* set limits */ |
| 137 |
-/* GETSTATS at 0x0800 is now longer... */ |
| 138 |
-#define QC_GETINFO 0x0900 /* get info about quotas - graces, flags... */ |
| 139 |
-#define QC_SETINFO 0x0A00 /* set info about quotas */ |
| 140 |
-#define QC_SETGRACE 0x0B00 /* set inode and block grace */ |
| 141 |
-#define QC_SETFLAGS 0x0C00 /* set flags for quota */ |
| 142 |
-#define QC_GETQUOTA 0x0D00 /* get limits and usage */ |
| 143 |
-#define QC_SETQUOTA 0x0E00 /* set limits and usage */ |
| 144 |
-#define QC_SETUSE 0x0F00 /* set usage */ |
| 145 |
-/* 0x1000 used by old RSQUASH */ |
| 146 |
-#define QC_GETSTATS 0x1100 /* get collected stats */ |
| 147 |
- |
| 148 |
-struct compat_v2_dqblk { |
| 149 |
- unsigned int dqb_ihardlimit; |
| 150 |
- unsigned int dqb_isoftlimit; |
| 151 |
- unsigned int dqb_curinodes; |
| 152 |
- unsigned int dqb_bhardlimit; |
| 153 |
- unsigned int dqb_bsoftlimit; |
| 154 |
- qsize_t dqb_curspace; |
| 155 |
- __kernel_time_t dqb_btime; |
| 156 |
- __kernel_time_t dqb_itime; |
| 157 |
-}; |
| 158 |
- |
| 159 |
-#ifdef CONFIG_COMPAT |
| 160 |
-struct compat_v2_dqblk_32 { |
| 161 |
- unsigned int dqb_ihardlimit; |
| 162 |
- unsigned int dqb_isoftlimit; |
| 163 |
- unsigned int dqb_curinodes; |
| 164 |
- unsigned int dqb_bhardlimit; |
| 165 |
- unsigned int dqb_bsoftlimit; |
| 166 |
- qsize_t dqb_curspace; |
| 167 |
- compat_time_t dqb_btime; |
| 168 |
- compat_time_t dqb_itime; |
| 169 |
-} __attribute__ ((packed)); |
| 170 |
-#endif |
| 171 |
-#endif |
| 172 |
- |
| 173 |
struct quota_module_name { |
| 174 |
int qm_fmt_id; |
| 175 |
char *qm_mod_name; |
| 176 |
|
| 177 |
|
| 178 |
|
| 179 |
1.1 sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.059.3-e1000-build.patch |
| 180 |
|
| 181 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.059.3-e1000-build.patch?rev=1.1&view=markup |
| 182 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.059.3-e1000-build.patch?rev=1.1&content-type=text/plain |
| 183 |
|
| 184 |
Index: openvz-sources-2.6.18.028.059.3-e1000-build.patch |
| 185 |
=================================================================== |
| 186 |
diff -up ./drivers/net/Kconfig.e100k ./drivers/net/Kconfig |
| 187 |
--- ./drivers/net/Kconfig.e100k 2008-09-30 12:43:46.000000000 +0400 |
| 188 |
+++ ./drivers/net/Kconfig 2008-10-27 17:41:54.000000000 +0300 |
| 189 |
@@ -1915,6 +1915,7 @@ config DL2K |
| 190 |
config E1000 |
| 191 |
tristate "Intel(R) PRO/1000 Gigabit Ethernet support" |
| 192 |
depends on PCI |
| 193 |
+ select E1000E |
| 194 |
---help--- |
| 195 |
This driver supports Intel(R) PRO/1000 gigabit ethernet family of |
| 196 |
adapters. For more information on how to identify your adapter, go |
Archives