[packages/kernel/LINUX_2_6_34] - up to 2.6.34.14; grsec/vserver/tuxonice off by default (patches not maintained for this line); dis

arekm arekm at pld-linux.org
Sat Feb 23 07:28:44 CET 2013


commit e9d634d90cb173f6e9864e3bd96425cd48750990
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Feb 23 07:28:39 2013 +0100

    - up to 2.6.34.14; grsec/vserver/tuxonice off by default (patches not maintained for this line); disabled TMS380TR driver - broken

 ...ser_space-incorporate-the-access_ok-check.patch | 189 ---------------------
 ...st-rax-for-the-system-call-number-not-eax.patch |  97 -----------
 ...cate-rax-after-ia32-syscall-entry-tracing.patch |  49 ------
 kernel-multiarch.config                            |   3 +-
 kernel-tuxonice-headers.patch                      |   8 +-
 kernel-tuxonice.patch                              |   6 +-
 kernel.spec                                        |  24 +--
 7 files changed, 17 insertions(+), 359 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index f9ad69a..9bb3f70 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -31,8 +31,8 @@
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_without	reiser4		# support for reiser4 fs (experimental)
 
-%bcond_without	grsecurity	# don't build grsecurity nor pax at all
-%bcond_without	grsec_full	# build full grsecurity
+%bcond_with	grsecurity	# don't build grsecurity nor pax at all
+%bcond_with	grsec_full	# build full grsecurity
 %bcond_with	grsec_minimal	# build only minimal subset (proc,link,fifo,shm)
 %bcond_with	pax		# build pax and full grsecurity (ie. grsec_full && pax)
 
@@ -45,8 +45,8 @@
 %bcond_without	esfq		# esfq support
 %bcond_without	ipv6		# ipv6 support
 
-%bcond_without	vserver		# support for VServer (enabled by default)
-%bcond_without	tuxonice	# support for tuxonice (ex-suspend2) (enabled by default)
+%bcond_with	vserver		# support for VServer
+%bcond_with	tuxonice	# support for tuxonice (ex-suspend2)
 %bcond_without	apparmor	# build kernel with apparmor (exerimental mix)
 
 %bcond_with	rescuecd	# build kernel for our rescue
@@ -114,8 +114,8 @@
 %endif
 
 %define		basever		2.6.34
-%define		postver		.7
-%define		rel		2
+%define		postver		.14
+%define		rel		1
 
 %define		_enable_debug_packages			0
 
@@ -157,8 +157,8 @@ Group:		Base/Kernel
 Source0:	http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{basever}.tar.bz2
 # Source0-md5:	10eebcb0178fb4540e2165bfd7efc7ad
 %if "%{postver}" != "%{nil}"
-Source1:	http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
-# Source1-md5:	a88e4b5a9fcb23c2229301ac4dae1f1a
+Source1:	http://www.kernel.org/pub/linux/kernel/v2.6/longterm/v%{basever}/patch-%{version}.bz2
+# Source1-md5:	715ad265b0ea11fd30979a918a63645e
 %endif
 
 Source3:	kernel-autoconf.h
@@ -314,10 +314,6 @@ Patch2000:	kernel-small_fixes.patch
 Patch2001:	kernel-pwc-uncompress.patch
 Patch2003:	kernel-regressions.patch
 
-Patch2004:	01-compat-make-compat_alloc_user_space-incorporate-the-access_ok-check.patch
-Patch2005:	02-compat-test-rax-for-the-system-call-number-not-eax.patch
-Patch2006:	03-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch
-
 # kill some thousands of warnings
 # (only warnings, so just remove parts of this patch if conflics)
 Patch2500:	kernel-warnings.patch
@@ -874,10 +870,6 @@ sed -i 's/-Werror//' arch/alpha/kernel/Makefile
 %patch2001 -p1
 #%patch2003 -p1
 
-%patch2004 -p1
-%patch2005 -p1
-%patch2006 -p1
-
 # Fix EXTRAVERSION in main Makefile
 sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{postver}%{?alt_kernel:_%{alt_kernel}}#g' Makefile
 
diff --git a/01-compat-make-compat_alloc_user_space-incorporate-the-access_ok-check.patch b/01-compat-make-compat_alloc_user_space-incorporate-the-access_ok-check.patch
deleted file mode 100644
index f0ecb03..0000000
--- a/01-compat-make-compat_alloc_user_space-incorporate-the-access_ok-check.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-From c41d68a513c71e35a14f66d71782d27a79a81ea6 Mon Sep 17 00:00:00 2001
-From: H. Peter Anvin <hpa at linux.intel.com>
-Date: Tue, 7 Sep 2010 16:16:18 -0700
-Subject: [PATCH] compat: Make compat_alloc_user_space() incorporate the access_ok()
-
-compat_alloc_user_space() expects the caller to independently call
-access_ok() to verify the returned area.  A missing call could
-introduce problems on some architectures.
-
-This patch incorporates the access_ok() check into
-compat_alloc_user_space() and also adds a sanity check on the length.
-The existing compat_alloc_user_space() implementations are renamed
-arch_compat_alloc_user_space() and are used as part of the
-implementation of the new global function.
-
-This patch assumes NULL will cause __get_user()/__put_user() to either
-fail or access userspace on all architectures.  This should be
-followed by checking the return value of compat_access_user_space()
-for NULL in the callers, at which time the access_ok() in the callers
-can also be removed.
-
-Reported-by: Ben Hawkes <hawkes at sota.gen.nz>
-Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>
-Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
-Acked-by: Chris Metcalf <cmetcalf at tilera.com>
-Acked-by: David S. Miller <davem at davemloft.net>
-Acked-by: Ingo Molnar <mingo at elte.hu>
-Acked-by: Thomas Gleixner <tglx at linutronix.de>
-Acked-by: Tony Luck <tony.luck at intel.com>
-Cc: Andrew Morton <akpm at linux-foundation.org>
-Cc: Arnd Bergmann <arnd at arndb.de>
-Cc: Fenghua Yu <fenghua.yu at intel.com>
-Cc: H. Peter Anvin <hpa at zytor.com>
-Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
-Cc: Helge Deller <deller at gmx.de>
-Cc: James Bottomley <jejb at parisc-linux.org>
-Cc: Kyle McMartin <kyle at mcmartin.ca>
-Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
-Cc: Paul Mackerras <paulus at samba.org>
-Cc: Ralf Baechle <ralf at linux-mips.org>
-Cc: <stable at kernel.org>
----
- arch/ia64/include/asm/compat.h    |    2 +-
- arch/mips/include/asm/compat.h    |    2 +-
- arch/parisc/include/asm/compat.h  |    2 +-
- arch/powerpc/include/asm/compat.h |    2 +-
- arch/s390/include/asm/compat.h    |    2 +-
- arch/sparc/include/asm/compat.h   |    2 +-
- arch/x86/include/asm/compat.h     |    2 +-
- include/linux/compat.h            |    3 +++
- kernel/compat.c                   |   21 +++++++++++++++++++++
- 10 files changed, 32 insertions(+), 8 deletions(-)
-
-diff --git a/arch/ia64/include/asm/compat.h b/arch/ia64/include/asm/compat.h
-index f90edc8..9301a28 100644
---- a/arch/ia64/include/asm/compat.h
-+++ b/arch/ia64/include/asm/compat.h
-@@ -199,7 +199,7 @@ ptr_to_compat(void __user *uptr)
- }
- 
- static __inline__ void __user *
--compat_alloc_user_space (long len)
-+arch_compat_alloc_user_space (long len)
- {
- 	struct pt_regs *regs = task_pt_regs(current);
- 	return (void __user *) (((regs->r12 & 0xffffffff) & -16) - len);
-diff --git a/arch/mips/include/asm/compat.h b/arch/mips/include/asm/compat.h
-index 613f691..dbc5106 100644
---- a/arch/mips/include/asm/compat.h
-+++ b/arch/mips/include/asm/compat.h
-@@ -145,7 +145,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr)
- 	return (u32)(unsigned long)uptr;
- }
- 
--static inline void __user *compat_alloc_user_space(long len)
-+static inline void __user *arch_compat_alloc_user_space(long len)
- {
- 	struct pt_regs *regs = (struct pt_regs *)
- 		((unsigned long) current_thread_info() + THREAD_SIZE - 32) - 1;
-diff --git a/arch/parisc/include/asm/compat.h b/arch/parisc/include/asm/compat.h
-index 02b77ba..efa0b60 100644
---- a/arch/parisc/include/asm/compat.h
-+++ b/arch/parisc/include/asm/compat.h
-@@ -147,7 +147,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr)
- 	return (u32)(unsigned long)uptr;
- }
- 
--static __inline__ void __user *compat_alloc_user_space(long len)
-+static __inline__ void __user *arch_compat_alloc_user_space(long len)
- {
- 	struct pt_regs *regs = &current->thread.regs;
- 	return (void __user *)regs->gr[30];
-diff --git a/arch/powerpc/include/asm/compat.h b/arch/powerpc/include/asm/compat.h
-index 396d21a..a11d4ea 100644
---- a/arch/powerpc/include/asm/compat.h
-+++ b/arch/powerpc/include/asm/compat.h
-@@ -134,7 +134,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr)
- 	return (u32)(unsigned long)uptr;
- }
- 
--static inline void __user *compat_alloc_user_space(long len)
-+static inline void __user *arch_compat_alloc_user_space(long len)
- {
- 	struct pt_regs *regs = current->thread.regs;
- 	unsigned long usp = regs->gpr[1];
-diff --git a/arch/s390/include/asm/compat.h b/arch/s390/include/asm/compat.h
-index 104f200..a875c2f 100644
---- a/arch/s390/include/asm/compat.h
-+++ b/arch/s390/include/asm/compat.h
-@@ -181,7 +181,7 @@ static inline int is_compat_task(void)
- 
- #endif
- 
--static inline void __user *compat_alloc_user_space(long len)
-+static inline void __user *arch_compat_alloc_user_space(long len)
- {
- 	unsigned long stack;
- 
-diff --git a/arch/sparc/include/asm/compat.h b/arch/sparc/include/asm/compat.h
-index 5016f76..6f57325 100644
---- a/arch/sparc/include/asm/compat.h
-+++ b/arch/sparc/include/asm/compat.h
-@@ -167,7 +167,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr)
- 	return (u32)(unsigned long)uptr;
- }
- 
--static inline void __user *compat_alloc_user_space(long len)
-+static inline void __user *arch_compat_alloc_user_space(long len)
- {
- 	struct pt_regs *regs = current_thread_info()->kregs;
- 	unsigned long usp = regs->u_regs[UREG_I6];
-diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
-index 306160e..1d9cd27 100644
---- a/arch/x86/include/asm/compat.h
-+++ b/arch/x86/include/asm/compat.h
-@@ -205,7 +205,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr)
- 	return (u32)(unsigned long)uptr;
- }
- 
--static inline void __user *compat_alloc_user_space(long len)
-+static inline void __user *arch_compat_alloc_user_space(long len)
- {
- 	struct pt_regs *regs = task_pt_regs(current);
- 	return (void __user *)regs->sp - len;
-diff --git a/include/linux/compat.h b/include/linux/compat.h
-index 9ddc878..5778b55 100644
---- a/include/linux/compat.h
-+++ b/include/linux/compat.h
-@@ -360,5 +360,8 @@ extern ssize_t compat_rw_copy_check_uvector(int type,
- 		const struct compat_iovec __user *uvector, unsigned long nr_segs,
- 		unsigned long fast_segs, struct iovec *fast_pointer,
- 		struct iovec **ret_pointer);
-+
-+extern void __user *compat_alloc_user_space(unsigned long len);
-+
- #endif /* CONFIG_COMPAT */
- #endif /* _LINUX_COMPAT_H */
-diff --git a/kernel/compat.c b/kernel/compat.c
-index e167efc..c9e2ec0 100644
---- a/kernel/compat.c
-+++ b/kernel/compat.c
-@@ -1126,3 +1126,24 @@ compat_sys_sysinfo(struct compat_sysinfo __user *info)
- 
- 	return 0;
- }
-+
-+/*
-+ * Allocate user-space memory for the duration of a single system call,
-+ * in order to marshall parameters inside a compat thunk.
-+ */
-+void __user *compat_alloc_user_space(unsigned long len)
-+{
-+	void __user *ptr;
-+
-+	/* If len would occupy more than half of the entire compat space... */
-+	if (unlikely(len > (((compat_uptr_t)~0) >> 1)))
-+		return NULL;
-+
-+	ptr = arch_compat_alloc_user_space(len);
-+
-+	if (unlikely(!access_ok(VERIFY_WRITE, ptr, len)))
-+		return NULL;
-+
-+	return ptr;
-+}
-+EXPORT_SYMBOL_GPL(compat_alloc_user_space);
--- 
-1.7.2.3
-
diff --git a/02-compat-test-rax-for-the-system-call-number-not-eax.patch b/02-compat-test-rax-for-the-system-call-number-not-eax.patch
deleted file mode 100644
index 15ff0ca..0000000
--- a/02-compat-test-rax-for-the-system-call-number-not-eax.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 36d001c70d8a0144ac1d038f6876c484849a74de Mon Sep 17 00:00:00 2001
-From: H. Peter Anvin <hpa at linux.intel.com>
-Date: Tue, 14 Sep 2010 12:42:41 -0700
-Subject: [PATCH] x86-64, compat: Test %rax for the syscall number, not %eax
-
-On 64 bits, we always, by necessity, jump through the system call
-table via %rax.  For 32-bit system calls, in theory the system call
-number is stored in %eax, and the code was testing %eax for a valid
-system call number.  At one point we loaded the stored value back from
-the stack to enforce zero-extension, but that was removed in checkin
-d4d67150165df8bf1cc05e532f6efca96f907cab.  An actual 32-bit process
-will not be able to introduce a non-zero-extended number, but it can
-happen via ptrace.
-
-Instead of re-introducing the zero-extension, test what we are
-actually going to use, i.e. %rax.  This only adds a handful of REX
-prefixes to the code.
-
-Reported-by: Ben Hawkes <hawkes at sota.gen.nz>
-Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>
-Cc: <stable at kernel.org>
-Cc: Roland McGrath <roland at redhat.com>
-Cc: Andrew Morton <akpm at linux-foundation.org>
----
- arch/x86/ia32/ia32entry.S |   14 +++++++-------
- 1 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
-index b86feab..84e3a4e 100644
---- a/arch/x86/ia32/ia32entry.S
-+++ b/arch/x86/ia32/ia32entry.S
-@@ -153,7 +153,7 @@ ENTRY(ia32_sysenter_target)
- 	testl  $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
- 	CFI_REMEMBER_STATE
- 	jnz  sysenter_tracesys
--	cmpl	$(IA32_NR_syscalls-1),%eax
-+	cmpq	$(IA32_NR_syscalls-1),%rax
- 	ja	ia32_badsys
- sysenter_do_call:
- 	IA32_ARG_FIXUP
-@@ -195,7 +195,7 @@ sysexit_from_sys_call:
- 	movl $AUDIT_ARCH_I386,%edi	/* 1st arg: audit arch */
- 	call audit_syscall_entry
- 	movl RAX-ARGOFFSET(%rsp),%eax	/* reload syscall number */
--	cmpl $(IA32_NR_syscalls-1),%eax
-+	cmpq $(IA32_NR_syscalls-1),%rax
- 	ja ia32_badsys
- 	movl %ebx,%edi			/* reload 1st syscall arg */
- 	movl RCX-ARGOFFSET(%rsp),%esi	/* reload 2nd syscall arg */
-@@ -248,7 +248,7 @@ sysenter_tracesys:
- 	call	syscall_trace_enter
- 	LOAD_ARGS32 ARGOFFSET  /* reload args from stack in case ptrace changed it */
- 	RESTORE_REST
--	cmpl	$(IA32_NR_syscalls-1),%eax
-+	cmpq	$(IA32_NR_syscalls-1),%rax
- 	ja	int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
- 	jmp	sysenter_do_call
- 	CFI_ENDPROC
-@@ -314,7 +314,7 @@ ENTRY(ia32_cstar_target)
- 	testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
- 	CFI_REMEMBER_STATE
- 	jnz   cstar_tracesys
--	cmpl $IA32_NR_syscalls-1,%eax
-+	cmpq $IA32_NR_syscalls-1,%rax
- 	ja  ia32_badsys
- cstar_do_call:
- 	IA32_ARG_FIXUP 1
-@@ -367,7 +367,7 @@ cstar_tracesys:
- 	LOAD_ARGS32 ARGOFFSET, 1  /* reload args from stack in case ptrace changed it */
- 	RESTORE_REST
- 	xchgl %ebp,%r9d
--	cmpl $(IA32_NR_syscalls-1),%eax
-+	cmpq $(IA32_NR_syscalls-1),%rax
- 	ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
- 	jmp cstar_do_call
- END(ia32_cstar_target)
-@@ -425,7 +425,7 @@ ENTRY(ia32_syscall)
- 	orl   $TS_COMPAT,TI_status(%r10)
- 	testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
- 	jnz ia32_tracesys
--	cmpl $(IA32_NR_syscalls-1),%eax
-+	cmpq $(IA32_NR_syscalls-1),%rax
- 	ja ia32_badsys
- ia32_do_call:
- 	IA32_ARG_FIXUP
-@@ -444,7 +444,7 @@ ia32_tracesys:
- 	call syscall_trace_enter
- 	LOAD_ARGS32 ARGOFFSET  /* reload args from stack in case ptrace changed it */
- 	RESTORE_REST
--	cmpl $(IA32_NR_syscalls-1),%eax
-+	cmpq $(IA32_NR_syscalls-1),%rax
- 	ja  int_ret_from_sys_call	/* ia32_tracesys has set RAX(%rsp) */
- 	jmp ia32_do_call
- END(ia32_syscall)
--- 
-1.7.2.3
-
diff --git a/03-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch b/03-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch
deleted file mode 100644
index b7fa739..0000000
--- a/03-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From eefdca043e8391dcd719711716492063030b55ac Mon Sep 17 00:00:00 2001
-From: Roland McGrath <roland at redhat.com>
-Date: Tue, 14 Sep 2010 12:22:58 -0700
-Subject: [PATCH] x86-64, compat: Retruncate rax after ia32 syscall entry tracing
-
-In commit d4d6715, we reopened an old hole for a 64-bit ptracer touching a
-32-bit tracee in system call entry.  A %rax value set via ptrace at the
-entry tracing stop gets used whole as a 32-bit syscall number, while we
-only check the low 32 bits for validity.
-
-Fix it by truncating %rax back to 32 bits after syscall_trace_enter,
-in addition to testing the full 64 bits as has already been added.
-
-Reported-by: Ben Hawkes <hawkes at sota.gen.nz>
-Signed-off-by: Roland McGrath <roland at redhat.com>
-Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>
----
- arch/x86/ia32/ia32entry.S |    8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
-
-diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
-index 84e3a4e..518bb99 100644
---- a/arch/x86/ia32/ia32entry.S
-+++ b/arch/x86/ia32/ia32entry.S
-@@ -50,7 +50,12 @@
- 	/*
- 	 * Reload arg registers from stack in case ptrace changed them.
- 	 * We don't reload %eax because syscall_trace_enter() returned
--	 * the value it wants us to use in the table lookup.
-+	 * the %rax value we should see.  Instead, we just truncate that
-+	 * value to 32 bits again as we did on entry from user mode.
-+	 * If it's a new value set by user_regset during entry tracing,
-+	 * this matches the normal truncation of the user-mode value.
-+	 * If it's -1 to make us punt the syscall, then (u32)-1 is still
-+	 * an appropriately invalid value.
- 	 */
- 	.macro LOAD_ARGS32 offset, _r9=0
- 	.if \_r9
-@@ -60,6 +65,7 @@
- 	movl \offset+48(%rsp),%edx
- 	movl \offset+56(%rsp),%esi
- 	movl \offset+64(%rsp),%edi
-+	movl %eax,%eax			/* zero extension */
- 	.endm
- 	
- 	.macro CFI_STARTPROC32 simple
--- 
-1.7.2.3
-
diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index f4d7e5a..3500b6b 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -39,6 +39,7 @@ CRYPTO_AEAD all=m
 CRYPTO_BLKCIPHER all=m
 CRYPTO_HASH all=y
 CRYPTO_MANAGER all=y
+CRYPTO_MANAGER_TESTS all=y
 CRYPTO_GF128MUL all=m
 CRYPTO_NULL all=m
 CRYPTO_PCRYPT all=m
@@ -2845,7 +2846,7 @@ IBMTR alpha=m i386=m
 IBMOL all=m sparc=
 IBMLS i386=m ppc=n
 3C359 all=m sparc=
-TMS380TR all=m sparc=
+TMS380TR all=n sparc=
 TMSPCI all=m sparc=
 SKISA alpha=m i386=m
 PROTEON alpha=m i386=m
diff --git a/kernel-tuxonice-headers.patch b/kernel-tuxonice-headers.patch
index 99c7592..178d72e 100644
--- a/kernel-tuxonice-headers.patch
+++ b/kernel-tuxonice-headers.patch
@@ -13,22 +13,22 @@
  #include <asm/uaccess.h>
 --- e/include/linux/fs.h	2008-05-07 11:39:56.000000000 +0000
 +++ e/include/linux/fs.h	2008-05-07 11:43:49.907309587 +0000
-@@ -207,10 +207,13 @@
+@@ -210,11 +210,14 @@ struct inodes_stat_t {
  #define MS_KERNMOUNT	(1<<22) /* this is a kern_mount call */
  #define MS_I_VERSION	(1<<23) /* Update inode I_version field */
  #define MS_STRICTATIME	(1<<24) /* Always perform atime updates */
--#define MS_FROZEN	(1<<25)	/* Frozen by freeze_filesystems() */
+-#define MS_FROZEN	(1<<25) /* Frozen by freeze_filesystems() */
+ #define MS_BORN		(1<<29)
  #define MS_ACTIVE	(1<<30)
  #define MS_NOUSER	(1<<31)
  
 +
 +
-+#define MS_FROZEN	(1<<29) /* Frozen by freeze_filesystems() */
 +
++#define MS_FROZEN	(1<<29) /* Frozen by freeze_filesystems() */
  /*
   * Superblock flags that can be altered by MS_REMOUNT
   */
-
 --- e/include/linux/fs.h.orig	2009-07-20 14:35:32.000000000 +0200
 +++ e/include/linux/fs.h	2009-07-20 14:37:27.086666353 +0200
 @@ -230,6 +230,8 @@
diff --git a/kernel-tuxonice.patch b/kernel-tuxonice.patch
index cf925f3..3a2b8fb 100644
--- a/kernel-tuxonice.patch
+++ b/kernel-tuxonice.patch
@@ -3227,14 +3227,14 @@ index 44f35ae..b36014f 100644
  #define FS_REVAL_DOT	16384	/* Check the paths ".", ".." for staleness */
  #define FS_RENAME_DOES_D_MOVE	32768	/* FS will handle d_move()
  					 * during rename() internally.
-@@ -209,6 +210,7 @@ struct inodes_stat_t {
+@@ -210,6 +210,7 @@ struct inodes_stat_t {
  #define MS_KERNMOUNT	(1<<22) /* this is a kern_mount call */
  #define MS_I_VERSION	(1<<23) /* Update inode I_version field */
  #define MS_STRICTATIME	(1<<24) /* Always perform atime updates */
-+#define MS_FROZEN	(1<<25)	/* Frozen by freeze_filesystems() */
++#define MS_FROZEN	(1<<25) /* Frozen by freeze_filesystems() */
+ #define MS_BORN		(1<<29)
  #define MS_ACTIVE	(1<<30)
  #define MS_NOUSER	(1<<31)
- 
 @@ -235,6 +237,8 @@ struct inodes_stat_t {
  #define S_NOCMTIME	128	/* Do not update file c/mtime */
  #define S_SWAPFILE	256	/* Do not truncate: swapon got its bmaps */
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/e9d634d90cb173f6e9864e3bd96425cd48750990



More information about the pld-cvs-commit mailing list