From c98d03330787f1dc06830afdd53eed75228d76b6 Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Mon, 13 Nov 2006 17:47:16 +0000 Subject: [PATCH] cleaning up after merge --- Makefile | 2 +- fs/proc/base.c | 17 ++++++++++------- fs/proc/proc_misc.c | 1 + include/linux/vs_cvirt.h | 8 ++++---- kernel/timer.c | 2 +- kernel/vserver/sched.c | 1 - mm/oom_kill.c | 1 - scripts/kernel-2.6-planetlab.spec | 9 ++++----- 8 files changed, 21 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index 2a5c9cbfb..0e6824f4c 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 18 -EXTRAVERSION = -1.2224_FC5.vs2.0.2.2-rc6 +EXTRAVERSION = -1.2224_FC5.0 NAME=Avast! A bilge rat! # *DOCUMENTATION* diff --git a/fs/proc/base.c b/fs/proc/base.c index b7a5972f6..a76198105 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -1396,7 +1396,7 @@ static int pid_revalidate(struct dentry *dentry, struct nameidata *nd) if (task) { int pid = (inode->i_ino >> 16) & 0xFFFF; - if (!proc_pid_visible(task, pid)) + if (!vx_proc_pid_visible(task, pid)) goto out_drop; ret = 1; @@ -1694,6 +1694,9 @@ static struct inode_operations proc_tgid_attr_inode_operations; extern int proc_pid_vx_info(struct task_struct *, char *); extern int proc_pid_nx_info(struct task_struct *, char *); +extern int proc_pid_vx_info(struct task_struct *, char *); +extern int proc_pid_nx_info(struct task_struct *, char *); + /* SMP-safe */ static struct dentry *proc_pident_lookup(struct inode *dir, struct dentry *dentry, @@ -2123,7 +2126,7 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct goto out; rcu_read_lock(); - task = find_proc_task_by_pid(tgid); + task = vx_find_proc_task_by_pid(tgid); if (task) get_task_struct(task); rcu_read_unlock(); @@ -2176,7 +2179,7 @@ static struct dentry *proc_task_lookup(struct inode *dir, struct dentry * dentry goto out; rcu_read_lock(); - task = find_proc_task_by_pid(tid); + task = vx_find_proc_task_by_pid(tid); if (task) get_task_struct(task); rcu_read_unlock(); @@ -2232,7 +2235,7 @@ static struct task_struct *first_tgid(int tgid, unsigned int nr) struct task_struct *pos; rcu_read_lock(); if (tgid && nr) { - pos = find_proc_task_by_pid(tgid); + pos = vx_find_proc_task_by_pid(tgid); if (pos && thread_group_leader(pos)) goto found; } @@ -2310,7 +2313,7 @@ int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir) int len; ino_t ino; tgid = vx_map_tgid(task->pid); - if (!proc_pid_visible(task, tgid)) + if (!vx_proc_pid_visible(task, tgid)) continue; len = snprintf(buf, sizeof(buf), "%d", tgid); @@ -2346,7 +2349,7 @@ static struct task_struct *first_tid(struct task_struct *leader, rcu_read_lock(); /* Attempt to start with the pid of a thread */ if (tid && (nr > 0)) { - pos = find_proc_task_by_pid(tid); + pos = vx_find_proc_task_by_pid(tid); if (pos && (pos->group_leader == leader)) goto found; } @@ -2437,7 +2440,7 @@ static int proc_task_readdir(struct file * filp, void * dirent, filldir_t filldi task = next_tid(task), pos++) { int len; tid = vx_map_pid(task->pid); - if (!proc_pid_visible(task, tid)) + if (!vx_proc_pid_visible(task, tid)) continue; len = snprintf(buf, sizeof(buf), "%d", tid); diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index f8eebe6c7..e41f91db6 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c @@ -51,6 +51,7 @@ #include #include #include "internal.h" +#include #define LOAD_INT(x) ((x) >> FSHIFT) #define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100) diff --git a/include/linux/vs_cvirt.h b/include/linux/vs_cvirt.h index 3158d5a84..8275f538f 100644 --- a/include/linux/vs_cvirt.h +++ b/include/linux/vs_cvirt.h @@ -108,7 +108,7 @@ struct inode; #define VXF_FAKE_INIT (VXF_INFO_INIT|VXF_STATE_INIT) static inline -int proc_pid_visible(struct task_struct *task, int pid) +int vx_proc_pid_visible(struct task_struct *task, int pid) { if ((pid == 1) && !vx_flags(VXF_FAKE_INIT, VXF_FAKE_INIT)) @@ -122,11 +122,11 @@ visible: } static inline -struct task_struct *find_proc_task_by_pid(int pid) +struct task_struct *vx_find_proc_task_by_pid(int pid) { struct task_struct *task = find_task_by_pid(pid); - if (task && !proc_pid_visible(task, pid)) { + if (task && !vx_proc_pid_visible(task, pid)) { vxdprintk(VXD_CBIT(misc, 6), "dropping task %p[#%u,%u] for %p[#%u,%u]", task, task->xid, task->pid, @@ -141,7 +141,7 @@ struct task_struct *vx_get_proc_task(struct inode *inode, struct pid *pid) { struct task_struct *task = get_pid_task(pid, PIDTYPE_PID); - if (task && !proc_pid_visible(task, pid->nr)) { + if (task && !vx_proc_pid_visible(task, pid->nr)) { vxdprintk(VXD_CBIT(misc, 6), "dropping task %p[#%u,%u] for %p[#%u,%u]", task, task->xid, task->pid, diff --git a/kernel/timer.c b/kernel/timer.c index a9d5871c3..84a947faf 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1322,7 +1322,7 @@ asmlinkage long sys_getpid(void) /* * Accessing ->parent is not SMP-safe, it could * change from under us. However, we can use a stale - * value of ->parent under rcu_read_lock(), see + * value of ->real_parent under rcu_read_lock(), see * release_task()->call_rcu(delayed_put_task_struct). */ asmlinkage long sys_getppid(void) diff --git a/kernel/vserver/sched.c b/kernel/vserver/sched.c index f7971fef0..9dae08b1f 100644 --- a/kernel/vserver/sched.c +++ b/kernel/vserver/sched.c @@ -10,7 +10,6 @@ * */ -#include #include #include #include diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 659ec7829..ac1055f2b 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -15,7 +15,6 @@ * kernel subsystems and hints as to where to find out what things do. */ -#include #include #include #include diff --git a/scripts/kernel-2.6-planetlab.spec b/scripts/kernel-2.6-planetlab.spec index dbaa60291..58018cc4b 100644 --- a/scripts/kernel-2.6-planetlab.spec +++ b/scripts/kernel-2.6-planetlab.spec @@ -3,10 +3,10 @@ Summary: The Linux kernel (the core of the Linux operating system) # What parts do we want to build? We must build at least one kernel. # These are the kernels that are built IF the architecture allows it. -%define buildup 0 +%define buildup 1 %define buildsmp 0 %define builduml 0 -%define buildxen 1 +%define buildxen 0 %define builddoc 0 # Versions of various parts @@ -17,10 +17,10 @@ Summary: The Linux kernel (the core of the Linux operating system) # that the kernel isn't the stock distribution kernel, for example by # adding some text to the end of the version number. # -%define sublevel 17 +%define sublevel 18 %define kversion 2.6.%{sublevel} %define rpmversion 2.6.%{sublevel} -%define release 1.2187_FC5.0%{?pldistro:.%{pldistro}}%{?date:.%{date}} +%define release 1.2224_FC5.0%{?pldistro:.%{pldistro}}%{?date:.%{date}} %define signmodules 0 %define make_target bzImage %define kernel_arch i386 @@ -376,7 +376,6 @@ BuildKernel() { rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include cp arch/%{_arch}/kernel/asm-offsets.s $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch}/kernel || : cp .config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build - cp .kernelrelease $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ cp -a scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build if [ -d arch/%{_arch}/scripts ]; then cp -a arch/%{_arch}/scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch} || : -- 2.43.0