kernel-vserver-fixes.patch

   1 --- linux-3.3/fs/proc/base.c~   2012-03-19 21:44:42.000000000 +0100
   2 +++ linux-3.3/fs/proc/base.c    2012-03-21 12:25:28.051092423 +0100
   3 @@ -568,6 +568,8 @@
   4                                  struct task_struct *task,
   5                                  int hide_pid_min)
   6  {
   7 +       if (vx_check(0, VS_WATCH_P))
   8 +               return true;
   9         if (pid->hide_pid < hide_pid_min)
  10                 return true;
  11         if (in_group_p(pid->pid_gid))
  12 --- linux-4.9.76/include/linux/vs_time.h        1970-01-01 00:00:00.000000000 +0000
  13 +++ linux-4.9.76-vs2.3.9.5/include/linux/vs_time.h      2018-01-10 09:27:12.000000000 +0000
  14 @@ -7,7 +7,7 @@
  15
  16  extern void vx_adjust_timespec(struct timespec *ts);
  17  extern int vx_settimeofday(const struct timespec *ts);
  18 -extern int vx_settimeofday64(const struct timespec *ts);
  19 +extern int vx_settimeofday64(const struct timespec64 *ts);
  20
  21  #else
  22  #define        vx_adjust_timespec(t)   do { } while (0)
  23 --- linux-4.9.76/include/linux/vserver/cvirt.h  1970-01-01 00:00:00.000000000 +0000
  24 +++ linux-4.9.76-vs2.3.9.5/include/linux/vserver/cvirt.h        2018-01-10 02:50:49.000000000 +0000
  25 @@ -3,7 +3,7 @@ diff -NurpP --minimal linux-4.9.76/include/linux/vserver/cvirt.h linux-4.9.76-vs
  26
  27  struct timespec;
  28
  29 -void vx_vsi_boottime(struct timespec *);
  30 +void vx_vsi_boottime(struct timespec64 *);
  31
  32  void vx_vsi_uptime(struct timespec *, struct timespec *);
  33
  34 --- linux-4.9.76/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000
  35 +++ linux-4.9.76-vs2.3.9.5/kernel/vserver/cvirt.c       2018-01-11 08:36:23.000000000 +0000
  36 @@ -20,11 +20,11 @@ diff -NurpP --minimal linux-4.9.76/kernel/vserver/cvirt.c linux-4.9.76-vs2.3.9.5
  37  #include <asm/uaccess.h>
  38
  39
  40 -void vx_vsi_boottime(struct timespec *boottime)
  41 +void vx_vsi_boottime(struct timespec64 *boottime)
  42  {
  43         struct vx_info *vxi = current_vx_info();
  44
  45 -       set_normalized_timespec(boottime,
  46 +       set_normalized_timespec64(boottime,
  47                 boottime->tv_sec + vxi->cvirt.bias_uptime.tv_sec,
  48                 boottime->tv_nsec + vxi->cvirt.bias_uptime.tv_nsec);
  49         return;
  50 @@ -245,8 +245,8 @@ diff -NurpP --minimal linux-4.9.76/kernel/vserver/cvirt.c linux-4.9.76-vs2.3.9.5
  51         struct _vx_cvirt *cvirt = &vxi->cvirt;
  52         struct timespec64 uptime;
  53
  54 -       ktime_get_ts(&uptime);
  55 -       set_normalized_timespec(&uptime,
  56 +       ktime_get_ts64(&uptime);
  57 +       set_normalized_timespec64(&uptime,
  58                 uptime.tv_sec - cvirt->bias_uptime.tv_sec,
  59                 uptime.tv_nsec - cvirt->bias_uptime.tv_nsec);
  60