* [gentoo-commits] gentoo-x86 commit in sys-kernel/openvz-sources/files: openvz-sources-2.6.18.028.056.1-CONFIG_SECCOMP-build.patch openvz-sources-2.6.18.028.059.3-e1000-build.patch openvz-sources-2.6.18.028.057.2-another-fix-build-xfrm.h.patch openvz-sources-2.6.18-ms-splice-access.patch openvz-sources-2.6.18.028.057.2-fix-build-xfrm.h.patch
@ 2008-10-29 15:28 Peter Volkov (pva)
0 siblings, 0 replies; only message in thread
From: Peter Volkov (pva) @ 2008-10-29 15:28 UTC (permalink / raw
To: gentoo-commits
pva 08/10/29 15:28:12
Added:
openvz-sources-2.6.18.028.056.1-CONFIG_SECCOMP-build.patch
openvz-sources-2.6.18.028.059.3-e1000-build.patch
Removed:
openvz-sources-2.6.18.028.057.2-another-fix-build-xfrm.h.patch
openvz-sources-2.6.18-ms-splice-access.patch
openvz-sources-2.6.18.028.057.2-fix-build-xfrm.h.patch
Log:
Bumped rhel5 based (~arch) and 2.6.24 kernels. Fixed build issue if CONFIG_SECCOMP is enabled, bug #242728, thank Balazs Nemeth for report.
(Portage version: 2.2_rc12/cvs/Linux 2.6.26-openvz.git-35f41f1 i686)
Revision Changes Path
1.1 sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.056.1-CONFIG_SECCOMP-build.patch
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
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
Index: openvz-sources-2.6.18.028.056.1-CONFIG_SECCOMP-build.patch
===================================================================
diff --git a/fs/compat.c b/fs/compat.c
index 6c4741a..4f983e2 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -56,6 +56,10 @@
#include <asm/mmu_context.h>
#include <asm/ioctls.h>
+#ifdef CONFIG_QUOTA_COMPAT
+#include <linux/quota-compat.h>
+#endif
+
extern void sigset_from_compat(sigset_t *set, compat_sigset_t *compat);
int compat_log = 1;
diff --git a/fs/quota.c b/fs/quota.c
index e037b78..ca7a9be 100644
--- a/fs/quota.c
+++ b/fs/quota.c
@@ -18,6 +18,10 @@
#include <linux/capability.h>
#include <linux/quotaops.h>
+#ifdef CONFIG_QUOTA_COMPAT
+#include <linux/quota-compat.h>
+#endif
+
/* Check validity of generic quotactl commands */
static int generic_quotactl_valid(struct super_block *sb, int type, int cmd, qid_t id)
{
diff --git a/include/linux/quota-compat.h b/include/linux/quota-compat.h
new file mode 100644
index 0000000..c2f3435
--- /dev/null
+++ b/include/linux/quota-compat.h
@@ -0,0 +1,60 @@
+/*
+ * include/linux/quota-compat.h
+ *
+ * Copyright (C) 2008 SWsoft
+ * All rights reserved.
+ *
+ * Licensing governed by "linux/COPYING.SWsoft" file.
+ *
+ */
+
+#ifndef _LINUX_QUOTA_COMPAT_
+#define _LINUX_QUOTA_COMPAT_
+
+#include <linux/compat.h>
+
+#define QC_QUOTAON 0x0100 /* enable quotas */
+#define QC_QUOTAOFF 0x0200 /* disable quotas */
+
+/* GETQUOTA, SETQUOTA and SETUSE which were at 0x0300-0x0500 has now
+ * other parameteres
+ */
+#define QC_SYNC 0x0600 /* sync disk copy of a filesystems quotas */
+#define QC_SETQLIM 0x0700 /* set limits */
+/* GETSTATS at 0x0800 is now longer... */
+#define QC_GETINFO 0x0900 /* get info about quotas - graces, flags... */
+#define QC_SETINFO 0x0A00 /* set info about quotas */
+#define QC_SETGRACE 0x0B00 /* set inode and block grace */
+#define QC_SETFLAGS 0x0C00 /* set flags for quota */
+#define QC_GETQUOTA 0x0D00 /* get limits and usage */
+#define QC_SETQUOTA 0x0E00 /* set limits and usage */
+#define QC_SETUSE 0x0F00 /* set usage */
+/* 0x1000 used by old RSQUASH */
+#define QC_GETSTATS 0x1100 /* get collected stats */
+
+struct compat_v2_dqblk {
+ unsigned int dqb_ihardlimit;
+ unsigned int dqb_isoftlimit;
+ unsigned int dqb_curinodes;
+ unsigned int dqb_bhardlimit;
+ unsigned int dqb_bsoftlimit;
+ qsize_t dqb_curspace;
+ __kernel_time_t dqb_btime;
+ __kernel_time_t dqb_itime;
+};
+
+#ifdef CONFIG_COMPAT
+struct compat_v2_dqblk_32 {
+ unsigned int dqb_ihardlimit;
+ unsigned int dqb_isoftlimit;
+ unsigned int dqb_curinodes;
+ unsigned int dqb_bhardlimit;
+ unsigned int dqb_bsoftlimit;
+ qsize_t dqb_curspace;
+ compat_time_t dqb_btime;
+ compat_time_t dqb_itime;
+} __attribute__ ((packed));
+#endif
+
+#endif /* _LINUX_QUOTA_COMPAT_ */
+
diff --git a/include/linux/quota.h b/include/linux/quota.h
index c8ae394..55afad9 100644
--- a/include/linux/quota.h
+++ b/include/linux/quota.h
@@ -321,53 +321,6 @@ int mark_dquot_dirty(struct dquot *dquot);
int register_quota_format(struct quota_format_type *fmt);
void unregister_quota_format(struct quota_format_type *fmt);
-#ifdef CONFIG_QUOTA_COMPAT
-#include <linux/compat.h>
-
-#define QC_QUOTAON 0x0100 /* enable quotas */
-#define QC_QUOTAOFF 0x0200 /* disable quotas */
-
-/* GETQUOTA, SETQUOTA and SETUSE which were at 0x0300-0x0500 has now
- * other parameteres
- */
-#define QC_SYNC 0x0600 /* sync disk copy of a filesystems quotas */
-#define QC_SETQLIM 0x0700 /* set limits */
-/* GETSTATS at 0x0800 is now longer... */
-#define QC_GETINFO 0x0900 /* get info about quotas - graces, flags... */
-#define QC_SETINFO 0x0A00 /* set info about quotas */
-#define QC_SETGRACE 0x0B00 /* set inode and block grace */
-#define QC_SETFLAGS 0x0C00 /* set flags for quota */
-#define QC_GETQUOTA 0x0D00 /* get limits and usage */
-#define QC_SETQUOTA 0x0E00 /* set limits and usage */
-#define QC_SETUSE 0x0F00 /* set usage */
-/* 0x1000 used by old RSQUASH */
-#define QC_GETSTATS 0x1100 /* get collected stats */
-
-struct compat_v2_dqblk {
- unsigned int dqb_ihardlimit;
- unsigned int dqb_isoftlimit;
- unsigned int dqb_curinodes;
- unsigned int dqb_bhardlimit;
- unsigned int dqb_bsoftlimit;
- qsize_t dqb_curspace;
- __kernel_time_t dqb_btime;
- __kernel_time_t dqb_itime;
-};
-
-#ifdef CONFIG_COMPAT
-struct compat_v2_dqblk_32 {
- unsigned int dqb_ihardlimit;
- unsigned int dqb_isoftlimit;
- unsigned int dqb_curinodes;
- unsigned int dqb_bhardlimit;
- unsigned int dqb_bsoftlimit;
- qsize_t dqb_curspace;
- compat_time_t dqb_btime;
- compat_time_t dqb_itime;
-} __attribute__ ((packed));
-#endif
-#endif
-
struct quota_module_name {
int qm_fmt_id;
char *qm_mod_name;
1.1 sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.059.3-e1000-build.patch
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
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
Index: openvz-sources-2.6.18.028.059.3-e1000-build.patch
===================================================================
diff -up ./drivers/net/Kconfig.e100k ./drivers/net/Kconfig
--- ./drivers/net/Kconfig.e100k 2008-09-30 12:43:46.000000000 +0400
+++ ./drivers/net/Kconfig 2008-10-27 17:41:54.000000000 +0300
@@ -1915,6 +1915,7 @@ config DL2K
config E1000
tristate "Intel(R) PRO/1000 Gigabit Ethernet support"
depends on PCI
+ select E1000E
---help---
This driver supports Intel(R) PRO/1000 gigabit ethernet family of
adapters. For more information on how to identify your adapter, go
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2008-10-29 15:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-29 15:28 [gentoo-commits] gentoo-x86 commit in sys-kernel/openvz-sources/files: openvz-sources-2.6.18.028.056.1-CONFIG_SECCOMP-build.patch openvz-sources-2.6.18.028.059.3-e1000-build.patch openvz-sources-2.6.18.028.057.2-another-fix-build-xfrm.h.patch openvz-sources-2.6.18-ms-splice-access.patch openvz-sources-2.6.18.028.057.2-fix-build-xfrm.h.patch Peter Volkov (pva)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox