Author: baggins Date: Tue Feb 14 12:41:50 2006 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- vs2.1.1-rc5
---- Files affected:
SOURCES:
linux-2.6-vs2.1.patch (1.1.2.11 -> 1.1.2.12)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-vs2.1.patch
diff -u SOURCES/linux-2.6-vs2.1.patch:1.1.2.11
SOURCES/linux-2.6-vs2.1.patch:1.1.2.12
--- SOURCES/linux-2.6-vs2.1.patch:1.1.2.11 Mon Feb 13 23:29:02 2006
+++ SOURCES/linux-2.6-vs2.1.patch Tue Feb 14 13:41:44 2006
@@ -176,6 +176,14 @@
diff -NurpP --minimal linux-2.6.15.4/arch/alpha/kernel/ptrace.c
linux-2.6.15.4-vs2.1.1-rc3/arch/alpha/kernel/ptrace.c
--- linux-2.6.15.4/arch/alpha/kernel/ptrace.c 2005-06-22 02:37:51 +0200
+++ linux-2.6.15.4-vs2.1.1-rc3/arch/alpha/kernel/ptrace.c 2006-01-04
21:59:59 +0100
+@@ -15,6 +15,7 @@
+ #include <linux/slab.h>
+ #include <linux/security.h>
+ #include <linux/signal.h>
++#include <linux/vs_pid.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/pgtable.h>
@@ -289,6 +289,8 @@ do_sys_ptrace(long request, long pid, lo
read_unlock(&tasklist_lock);
if (!child)
@@ -690,6 +698,16 @@
data8 sys_ni_syscall
data8 sys_ni_syscall /* 275 */
data8 sys_ni_syscall
+--- linux-2.6.15.4/arch/ia64/ia32/sys_ia32.c 2006-01-03 17:29:09 +0100
++++ linux-2.6.15.4-vs2.1.1-rc5/arch/ia64/ia32/sys_ia32.c 2006-02-14
10:30:02 +0100
+@@ -51,6 +51,7 @@
+ #include <linux/compat.h>
+ #include <linux/vfs.h>
+ #include <linux/mman.h>
++#include <linux/vs_pid.h>
+
+ #include <asm/intrinsics.h>
+ #include <asm/semaphore.h>
diff -NurpP --minimal linux-2.6.15.4/arch/ia64/kernel/asm-offsets.c
linux-2.6.15.4-vs2.1.1-rc3/arch/ia64/kernel/asm-offsets.c
--- linux-2.6.15.4/arch/ia64/kernel/asm-offsets.c 2005-10-28 20:49:10
+0200
+++ linux-2.6.15.4-vs2.1.1-rc3/arch/ia64/kernel/asm-offsets.c 2006-01-04
21:59:59 +0100
@@ -827,6 +845,32 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
+--- linux-2.6.15.4/arch/ia64/sn/kernel/xpc_main.c 2006-01-03 17:29:09
+0100
++++ linux-2.6.15.4-vs2.1.1-rc5/arch/ia64/sn/kernel/xpc_main.c 2006-02-14
10:30:37 +0100
+@@ -105,6 +105,7 @@ static ctl_table xpc_sys_xpc_hb_dir[] =
+ 0644,
+ NULL,
+ &proc_dointvec_minmax,
++ NULL,
+ &sysctl_intvec,
+ NULL,
+ &xpc_hb_min_interval,
+@@ -118,6 +119,7 @@ static ctl_table xpc_sys_xpc_hb_dir[] =
+ 0644,
+ NULL,
+ &proc_dointvec_minmax,
++ NULL,
+ &sysctl_intvec,
+ NULL,
+ &xpc_hb_check_min_interval,
+@@ -142,6 +144,7 @@ static ctl_table xpc_sys_xpc_dir[] = {
+ 0644,
+ NULL,
+ &proc_dointvec_minmax,
++ NULL,
+ &sysctl_intvec,
+ NULL,
+ &xpc_disengage_request_min_timelimit,
diff -NurpP --minimal linux-2.6.15.4/arch/m32r/kernel/process.c
linux-2.6.15.4-vs2.1.1-rc3/arch/m32r/kernel/process.c
--- linux-2.6.15.4/arch/m32r/kernel/process.c 2006-01-03 17:29:09 +0100
+++ linux-2.6.15.4-vs2.1.1-rc3/arch/m32r/kernel/process.c 2006-01-04
21:59:59 +0100
@@ -962,6 +1006,14 @@
diff -NurpP --minimal linux-2.6.15.4/arch/mips/kernel/linux32.c
linux-2.6.15.4-vs2.1.1-rc3/arch/mips/kernel/linux32.c
--- linux-2.6.15.4/arch/mips/kernel/linux32.c 2006-01-03 17:29:11 +0100
+++ linux-2.6.15.4-vs2.1.1-rc3/arch/mips/kernel/linux32.c 2006-01-04
21:59:59 +0100
+@@ -37,6 +37,7 @@
+ #include <linux/security.h>
+ #include <linux/compat.h>
+ #include <linux/vfs.h>
++#include <linux/vs_cvirt.h>
+
+ #include <net/sock.h>
+ #include <net/scm.h>
@@ -1150,7 +1150,7 @@ asmlinkage long sys32_newuname(struct ne
int ret = 0;
@@ -1454,10 +1506,11 @@
@@ -154,9 +154,9 @@ void show_regs(struct pt_regs *regs)
struct task_struct *tsk = current;
- printk("CPU: %d %s\n", tsk->thread_info->cpu, print_tainted());
+- printk("CPU: %d %s\n", tsk->thread_info->cpu, print_tainted());
- printk("Process %s (pid: %d, task: %p, ksp: %p)\n",
- current->comm, current->pid, (void *) tsk,
- (void *) tsk->thread.ksp);
++ printk("CPU: %d %s\n", tsk->thread_info->cpu, print_tainted());
+ printk("Process %s (pid: %d[#%u], task: %p, ksp: %p)\n",
+ current->comm, current->pid, current->xid,
+ (void *) tsk, (void *) tsk->thread.ksp);
@@ -1588,6 +1641,14 @@
diff -NurpP --minimal linux-2.6.15.4/arch/sparc/kernel/ptrace.c
linux-2.6.15.4-vs2.1.1-rc3/arch/sparc/kernel/ptrace.c
--- linux-2.6.15.4/arch/sparc/kernel/ptrace.c 2005-06-22 02:37:59 +0200
+++ linux-2.6.15.4-vs2.1.1-rc3/arch/sparc/kernel/ptrace.c 2006-01-04
21:59:59 +0100
+@@ -19,6 +19,7 @@
+ #include <linux/smp_lock.h>
+ #include <linux/security.h>
+ #include <linux/signal.h>
++#include <linux/vs_pid.h>
+
+ #include <asm/pgtable.h>
+ #include <asm/system.h>
@@ -322,6 +322,10 @@ asmlinkage void do_ptrace(struct pt_regs
pt_error_return(regs, ESRCH);
goto out;
@@ -1690,6 +1751,14 @@
diff -NurpP --minimal linux-2.6.15.4/arch/sparc64/kernel/ptrace.c
linux-2.6.15.4-vs2.1.1-rc3/arch/sparc64/kernel/ptrace.c
--- linux-2.6.15.4/arch/sparc64/kernel/ptrace.c 2005-10-28 20:49:16
+0200
+++ linux-2.6.15.4-vs2.1.1-rc3/arch/sparc64/kernel/ptrace.c 2006-01-04
21:59:59 +0100
+@@ -22,6 +22,7 @@
+ #include <linux/seccomp.h>
+ #include <linux/audit.h>
+ #include <linux/signal.h>
++#include <linux/vs_pid.h>
+
+ #include <asm/asi.h>
+ #include <asm/pgtable.h>
@@ -233,6 +233,10 @@ asmlinkage void do_ptrace(struct pt_regs
pt_error_return(regs, ESRCH);
goto out;
@@ -1802,7 +1871,7 @@
#include "linux/namei.h"
#include "linux/proc_fs.h"
#include "linux/syscalls.h"
-+// #include "linux/vs_pid.h"
++#include "linux/vs_pid.h"
#include "asm/irq.h"
#include "asm/uaccess.h"
#include "user_util.h"
@@ -7474,7 +7543,7 @@
#include <linux/sunrpc/clnt.h>
#include <linux/nfs_fs.h>
#include <linux/nfs_mount.h>
-+// #include <linux/mount.h>
++#include <linux/mount.h>
#include <linux/pagemap.h>
#include <linux/smp_lock.h>
#include <linux/namei.h>
@@ -11092,6 +11161,14 @@
diff -NurpP --minimal linux-2.6.15.4/fs/xattr.c
linux-2.6.15.4-vs2.1.1-rc3/fs/xattr.c
--- linux-2.6.15.4/fs/xattr.c 2006-01-03 17:29:59 +0100
+++ linux-2.6.15.4-vs2.1.1-rc3/fs/xattr.c 2006-01-04 21:59:59 +0100
+@@ -17,6 +17,7 @@
+ #include <linux/syscalls.h>
+ #include <linux/module.h>
+ #include <linux/fsnotify.h>
++#include <linux/mount.h>
+ #include <asm/uaccess.h>
+
+ /*
@@ -24,7 +24,7 @@
*/
static long
@@ -12620,9 +12697,9 @@
+ tag_t mnt_tag; /* tagging used for vfsmount */
};
-+#define MNT_IS_RDONLY(m) ((m) && ((m)->mnt_flags & MNT_RDONLY))
-+#define MNT_IS_NOATIME(m) ((m) && ((m)->mnt_flags & MNT_NOATIME))
-+#define MNT_IS_NODIRATIME(m) ((m) && ((m)->mnt_flags &
MNT_NODIRATIME))
++#define MNT_IS_RDONLY(m) ((m) && ((m)->mnt_flags & MNT_RDONLY))
++#define MNT_IS_NOATIME(m) ((m) && ((m)->mnt_flags & MNT_NOATIME))
++#define MNT_IS_NODIRATIME(m) ((m) && ((m)->mnt_flags & MNT_NODIRATIME))
+
static inline struct vfsmount *mntget(struct vfsmount *mnt)
{
@@ -17478,12 +17555,11 @@
diff -NurpP --minimal linux-2.6.15.4/kernel/Makefile
linux-2.6.15.4-vs2.1.1-rc3/kernel/Makefile
--- linux-2.6.15.4/kernel/Makefile 2006-01-03 17:30:12 +0100
+++ linux-2.6.15.4-vs2.1.1-rc3/kernel/Makefile 2006-01-04 21:59:59 +0100
-@@ -9,6 +9,9 @@ obj-y = sched.o fork.o exec_domain.o
+@@ -9,6 +9,8 @@ obj-y = sched.o fork.o exec_domain.o
rcupdate.o intermodule.o extable.o params.o posix-timers.o \
kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o
-+subdir-y += vserver
-+obj-y += vserver/vserver.o
++obj-y += vserver/
+
obj-$(CONFIG_FUTEX) += futex.o
obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o
@@ -24861,7 +24937,7 @@
+
+#ifdef CONFIG_VSERVER_LEGACY
+
-+#define COPY_MASK_V2(name, mask) \
++#define COPY_MASK_V2(name, mask) \
+ if (vc_data.name != SCHED_KEEP) { \
+ vc_data_v4.name = vc_data.name; \
+ vc_data_v4.set_mask |= mask; \
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux-2.6-vs2.1.patch?r1=1.1.2.11&r2=1.1.2.12&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
