オープンソース・ソフトウェアの開発とダウンロード

TOMOYO

Subversion リポジトリの参照

/[tomoyo]/trunk/1.6.x/ccs-patch/patches/ccs-patch-2.6.21.diff

Diff of /trunk/1.6.x/ccs-patch/patches/ccs-patch-2.6.21.diff

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 212 by kumaneko, Mon May 14 13:52:27 2007 UTC revision 237 by kumaneko, Wed May 23 12:07:12 2007 UTC
# Line 1  Line 1 
1  diff -ubBpEr linux-2.6.21/Makefile linux-2.6.21-ccs/Makefile  diff -ubBpEr linux-2.6.21/Makefile linux-2.6.21-ccs/Makefile
2  --- linux-2.6.21/Makefile       2007-04-28 04:02:41.208050488 +0900  --- linux-2.6.21/Makefile       2007-04-28 04:02:41.000000000 +0900
3  +++ linux-2.6.21-ccs/Makefile   2007-04-26 17:11:12.239770216 +0900  +++ linux-2.6.21-ccs/Makefile   2007-04-26 17:11:12.000000000 +0900
4  @@ -1,7 +1,7 @@  @@ -1,7 +1,7 @@
5   VERSION = 2   VERSION = 2
6   PATCHLEVEL = 6   PATCHLEVEL = 6
# Line 11  diff -ubBpEr linux-2.6.21/Makefile linux Line 11  diff -ubBpEr linux-2.6.21/Makefile linux
11    
12   # *DOCUMENTATION*   # *DOCUMENTATION*
13  diff -ubBpEr linux-2.6.21/fs/Kconfig linux-2.6.21-ccs/fs/Kconfig  diff -ubBpEr linux-2.6.21/fs/Kconfig linux-2.6.21-ccs/fs/Kconfig
14  --- linux-2.6.21/fs/Kconfig     2007-04-28 04:02:41.209050336 +0900  --- linux-2.6.21/fs/Kconfig     2007-04-28 04:02:41.000000000 +0900
15  +++ linux-2.6.21-ccs/fs/Kconfig 2007-04-28 04:02:47.852040448 +0900  +++ linux-2.6.21-ccs/fs/Kconfig 2007-04-26 17:17:25.000000000 +0900
16  @@ -2055,5 +2055,7 @@ endif  @@ -2055,5 +2055,7 @@ endif
17   source "fs/nls/Kconfig"   source "fs/nls/Kconfig"
18   source "fs/dlm/Kconfig"   source "fs/dlm/Kconfig"
# Line 22  diff -ubBpEr linux-2.6.21/fs/Kconfig lin Line 22  diff -ubBpEr linux-2.6.21/fs/Kconfig lin
22   endmenu   endmenu
23    
24  diff -ubBpEr linux-2.6.21/fs/Makefile linux-2.6.21-ccs/fs/Makefile  diff -ubBpEr linux-2.6.21/fs/Makefile linux-2.6.21-ccs/fs/Makefile
25  --- linux-2.6.21/fs/Makefile    2007-04-28 04:02:41.209050336 +0900  --- linux-2.6.21/fs/Makefile    2007-04-28 04:02:41.000000000 +0900
26  +++ linux-2.6.21-ccs/fs/Makefile        2007-04-28 04:02:47.853040296 +0900  +++ linux-2.6.21-ccs/fs/Makefile        2007-04-28 04:02:47.000000000 +0900
27  @@ -114,3 +114,5 @@ obj-$(CONFIG_HPPFS)         += hppfs/  @@ -114,3 +114,5 @@ obj-$(CONFIG_HPPFS)         += hppfs/
28   obj-$(CONFIG_DEBUG_FS)         += debugfs/   obj-$(CONFIG_DEBUG_FS)         += debugfs/
29   obj-$(CONFIG_OCFS2_FS)         += ocfs2/   obj-$(CONFIG_OCFS2_FS)         += ocfs2/
# Line 31  diff -ubBpEr linux-2.6.21/fs/Makefile li Line 31  diff -ubBpEr linux-2.6.21/fs/Makefile li
31  +  +
32  +include $(srctree)/fs/Makefile-2.6.ccs  +include $(srctree)/fs/Makefile-2.6.ccs
33  diff -ubBpEr linux-2.6.21/fs/attr.c linux-2.6.21-ccs/fs/attr.c  diff -ubBpEr linux-2.6.21/fs/attr.c linux-2.6.21-ccs/fs/attr.c
34  --- linux-2.6.21/fs/attr.c      2007-04-28 04:02:41.209050336 +0900  --- linux-2.6.21/fs/attr.c      2007-04-28 04:02:41.000000000 +0900
35  +++ linux-2.6.21-ccs/fs/attr.c  2007-04-28 04:02:47.854040144 +0900  +++ linux-2.6.21-ccs/fs/attr.c  2007-04-28 04:02:47.000000000 +0900
36  @@ -15,6 +15,9 @@  @@ -15,6 +15,9 @@
37   #include <linux/fcntl.h>   #include <linux/fcntl.h>
38   #include <linux/quotaops.h>   #include <linux/quotaops.h>
# Line 65  diff -ubBpEr linux-2.6.21/fs/attr.c linu Line 65  diff -ubBpEr linux-2.6.21/fs/attr.c linu
65                          if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||                          if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
66                              (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))                              (ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))
67  diff -ubBpEr linux-2.6.21/fs/compat.c linux-2.6.21-ccs/fs/compat.c  diff -ubBpEr linux-2.6.21/fs/compat.c linux-2.6.21-ccs/fs/compat.c
68  --- linux-2.6.21/fs/compat.c    2007-04-28 04:02:41.210050184 +0900  --- linux-2.6.21/fs/compat.c    2007-04-28 04:02:41.000000000 +0900
69  +++ linux-2.6.21-ccs/fs/compat.c        2007-04-28 04:02:47.857039688 +0900  +++ linux-2.6.21-ccs/fs/compat.c        2007-04-28 04:02:47.000000000 +0900
70  @@ -56,6 +56,9 @@  @@ -56,6 +56,9 @@
71   #include <asm/mmu_context.h>   #include <asm/mmu_context.h>
72   #include <asm/ioctls.h>   #include <asm/ioctls.h>
# Line 97  diff -ubBpEr linux-2.6.21/fs/compat.c li Line 97  diff -ubBpEr linux-2.6.21/fs/compat.c li
97                  free_arg_pages(bprm);                  free_arg_pages(bprm);
98    
99  diff -ubBpEr linux-2.6.21/fs/exec.c linux-2.6.21-ccs/fs/exec.c  diff -ubBpEr linux-2.6.21/fs/exec.c linux-2.6.21-ccs/fs/exec.c
100  --- linux-2.6.21/fs/exec.c      2007-04-28 04:02:41.210050184 +0900  --- linux-2.6.21/fs/exec.c      2007-04-28 04:02:41.000000000 +0900
101  +++ linux-2.6.21-ccs/fs/exec.c  2007-04-28 04:02:47.860039232 +0900  +++ linux-2.6.21-ccs/fs/exec.c  2007-04-28 04:02:47.000000000 +0900
102  @@ -58,6 +58,10 @@  @@ -58,6 +58,10 @@
103   #include <linux/kmod.h>   #include <linux/kmod.h>
104   #endif   #endif
# Line 142  diff -ubBpEr linux-2.6.21/fs/exec.c linu Line 142  diff -ubBpEr linux-2.6.21/fs/exec.c linu
142                  free_arg_pages(bprm);                  free_arg_pages(bprm);
143    
144  diff -ubBpEr linux-2.6.21/fs/fcntl.c linux-2.6.21-ccs/fs/fcntl.c  diff -ubBpEr linux-2.6.21/fs/fcntl.c linux-2.6.21-ccs/fs/fcntl.c
145  --- linux-2.6.21/fs/fcntl.c     2007-04-28 04:02:41.210050184 +0900  --- linux-2.6.21/fs/fcntl.c     2007-04-28 04:02:41.000000000 +0900
146  +++ linux-2.6.21-ccs/fs/fcntl.c 2007-04-28 04:02:47.862038928 +0900  +++ linux-2.6.21-ccs/fs/fcntl.c 2007-04-28 04:02:47.000000000 +0900
147  @@ -22,6 +22,9 @@  @@ -22,6 +22,9 @@
148   #include <asm/poll.h>   #include <asm/poll.h>
149   #include <asm/siginfo.h>   #include <asm/siginfo.h>
# Line 166  diff -ubBpEr linux-2.6.21/fs/fcntl.c lin Line 166  diff -ubBpEr linux-2.6.21/fs/fcntl.c lin
166          if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))          if ((arg & O_NOATIME) && !(filp->f_flags & O_NOATIME))
167                  if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))                  if (current->fsuid != inode->i_uid && !capable(CAP_FOWNER))
168  diff -ubBpEr linux-2.6.21/fs/ioctl.c linux-2.6.21-ccs/fs/ioctl.c  diff -ubBpEr linux-2.6.21/fs/ioctl.c linux-2.6.21-ccs/fs/ioctl.c
169  --- linux-2.6.21/fs/ioctl.c     2007-04-28 04:02:41.210050184 +0900  --- linux-2.6.21/fs/ioctl.c     2007-04-28 04:02:41.000000000 +0900
170  +++ linux-2.6.21-ccs/fs/ioctl.c 2007-04-28 04:02:47.863038776 +0900  +++ linux-2.6.21-ccs/fs/ioctl.c 2007-04-28 04:02:47.000000000 +0900
171  @@ -15,6 +15,9 @@  @@ -15,6 +15,9 @@
172    
173   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 189  diff -ubBpEr linux-2.6.21/fs/ioctl.c lin Line 189  diff -ubBpEr linux-2.6.21/fs/ioctl.c lin
189          if (filp->f_op->unlocked_ioctl) {          if (filp->f_op->unlocked_ioctl) {
190                  error = filp->f_op->unlocked_ioctl(filp, cmd, arg);                  error = filp->f_op->unlocked_ioctl(filp, cmd, arg);
191  diff -ubBpEr linux-2.6.21/fs/namei.c linux-2.6.21-ccs/fs/namei.c  diff -ubBpEr linux-2.6.21/fs/namei.c linux-2.6.21-ccs/fs/namei.c
192  --- linux-2.6.21/fs/namei.c     2007-04-28 04:02:41.211050032 +0900  --- linux-2.6.21/fs/namei.c     2007-04-28 04:02:41.000000000 +0900
193  +++ linux-2.6.21-ccs/fs/namei.c 2007-04-28 04:02:47.868038016 +0900  +++ linux-2.6.21-ccs/fs/namei.c 2007-04-28 04:02:47.000000000 +0900
194  @@ -37,6 +37,10 @@  @@ -37,6 +37,10 @@
195    
196   #define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])   #define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])
# Line 368  diff -ubBpEr linux-2.6.21/fs/namei.c lin Line 368  diff -ubBpEr linux-2.6.21/fs/namei.c lin
368          from = getname(oldname);          from = getname(oldname);
369          if(IS_ERR(from))          if(IS_ERR(from))
370  diff -ubBpEr linux-2.6.21/fs/namespace.c linux-2.6.21-ccs/fs/namespace.c  diff -ubBpEr linux-2.6.21/fs/namespace.c linux-2.6.21-ccs/fs/namespace.c
371  --- linux-2.6.21/fs/namespace.c 2007-04-28 04:02:41.212049880 +0900  --- linux-2.6.21/fs/namespace.c 2007-04-28 04:02:41.000000000 +0900
372  +++ linux-2.6.21-ccs/fs/namespace.c     2007-04-28 04:02:47.870037712 +0900  +++ linux-2.6.21-ccs/fs/namespace.c     2007-04-28 04:02:47.000000000 +0900
373  @@ -28,6 +28,12 @@  @@ -28,6 +28,12 @@
374   #include <asm/uaccess.h>   #include <asm/uaccess.h>
375   #include <asm/unistd.h>   #include <asm/unistd.h>
# Line 472  diff -ubBpEr linux-2.6.21/fs/namespace.c Line 472  diff -ubBpEr linux-2.6.21/fs/namespace.c
472                  path_release(&old_nd);                  path_release(&old_nd);
473                  goto out1;                  goto out1;
474  diff -ubBpEr linux-2.6.21/fs/open.c linux-2.6.21-ccs/fs/open.c  diff -ubBpEr linux-2.6.21/fs/open.c linux-2.6.21-ccs/fs/open.c
475  --- linux-2.6.21/fs/open.c      2007-04-28 04:02:41.212049880 +0900  --- linux-2.6.21/fs/open.c      2007-04-28 04:02:41.000000000 +0900
476  +++ linux-2.6.21-ccs/fs/open.c  2007-04-28 04:02:47.872037408 +0900  +++ linux-2.6.21-ccs/fs/open.c  2007-04-28 04:02:47.000000000 +0900
477  @@ -27,6 +27,12 @@  @@ -27,6 +27,12 @@
478   #include <linux/syscalls.h>   #include <linux/syscalls.h>
479   #include <linux/rcupdate.h>   #include <linux/rcupdate.h>
# Line 531  diff -ubBpEr linux-2.6.21/fs/open.c linu Line 531  diff -ubBpEr linux-2.6.21/fs/open.c linu
531                  /* XXX: this needs locking */                  /* XXX: this needs locking */
532                  tty_vhangup(current->signal->tty);                  tty_vhangup(current->signal->tty);
533  diff -ubBpEr linux-2.6.21/fs/proc/Makefile linux-2.6.21-ccs/fs/proc/Makefile  diff -ubBpEr linux-2.6.21/fs/proc/Makefile linux-2.6.21-ccs/fs/proc/Makefile
534  --- linux-2.6.21/fs/proc/Makefile       2007-04-28 04:02:41.212049880 +0900  --- linux-2.6.21/fs/proc/Makefile       2007-04-28 04:02:41.000000000 +0900
535  +++ linux-2.6.21-ccs/fs/proc/Makefile   2007-04-28 04:02:47.873037256 +0900  +++ linux-2.6.21-ccs/fs/proc/Makefile   2007-04-28 04:02:47.000000000 +0900
536  @@ -15,3 +15,6 @@ proc-$(CONFIG_PROC_KCORE)     += kcore.o  @@ -15,3 +15,6 @@ proc-$(CONFIG_PROC_KCORE)     += kcore.o
537   proc-$(CONFIG_PROC_VMCORE)     += vmcore.o   proc-$(CONFIG_PROC_VMCORE)     += vmcore.o
538   proc-$(CONFIG_PROC_DEVICETREE) += proc_devtree.o   proc-$(CONFIG_PROC_DEVICETREE) += proc_devtree.o
# Line 541  diff -ubBpEr linux-2.6.21/fs/proc/Makefi Line 541  diff -ubBpEr linux-2.6.21/fs/proc/Makefi
541  +proc-$(CONFIG_SAKURA) += ccs_proc.o  +proc-$(CONFIG_SAKURA) += ccs_proc.o
542  +proc-$(CONFIG_TOMOYO) += ccs_proc.o  +proc-$(CONFIG_TOMOYO) += ccs_proc.o
543  diff -ubBpEr linux-2.6.21/fs/proc/proc_misc.c linux-2.6.21-ccs/fs/proc/proc_misc.c  diff -ubBpEr linux-2.6.21/fs/proc/proc_misc.c linux-2.6.21-ccs/fs/proc/proc_misc.c
544  --- linux-2.6.21/fs/proc/proc_misc.c    2007-04-28 04:02:41.212049880 +0900  --- linux-2.6.21/fs/proc/proc_misc.c    2007-04-28 04:02:41.000000000 +0900
545  +++ linux-2.6.21-ccs/fs/proc/proc_misc.c        2007-04-26 17:11:28.490299760 +0900  +++ linux-2.6.21-ccs/fs/proc/proc_misc.c        2007-05-23 14:55:33.106176816 +0900
546  @@ -747,4 +747,13 @@ void __init proc_misc_init(void)  @@ -747,4 +747,13 @@ void __init proc_misc_init(void)
547                          entry->proc_fops = &proc_sysrq_trigger_operations;                          entry->proc_fops = &proc_sysrq_trigger_operations;
548          }          }
# Line 552  diff -ubBpEr linux-2.6.21/fs/proc/proc_m Line 552  diff -ubBpEr linux-2.6.21/fs/proc/proc_m
552  +       {  +       {
553  +               extern void __init CCSProc_Init(void);  +               extern void __init CCSProc_Init(void);
554  +               CCSProc_Init();  +               CCSProc_Init();
555  +               printk("Hook version: 2.6.21 2007/04/26\n");  +               printk("Hook version: 2.6.21 2007/05/23\n");
556  +       }  +       }
557  +#endif  +#endif
558  +       /***** CCS end. *****/  +       /***** CCS end. *****/
559   }   }
560  diff -ubBpEr linux-2.6.21/include/linux/init_task.h linux-2.6.21-ccs/include/linux/init_task.h  diff -ubBpEr linux-2.6.21/include/linux/init_task.h linux-2.6.21-ccs/include/linux/init_task.h
561  --- linux-2.6.21/include/linux/init_task.h      2007-04-28 04:02:41.212049880 +0900  --- linux-2.6.21/include/linux/init_task.h      2007-04-28 04:02:41.000000000 +0900
562  +++ linux-2.6.21-ccs/include/linux/init_task.h  2007-04-28 04:02:47.876036800 +0900  +++ linux-2.6.21-ccs/include/linux/init_task.h  2007-04-28 04:02:47.000000000 +0900
563  @@ -141,6 +141,10 @@ extern struct group_info init_groups;  @@ -141,6 +141,10 @@ extern struct group_info init_groups;
564          .pi_lock        = SPIN_LOCK_UNLOCKED,                           \          .pi_lock        = SPIN_LOCK_UNLOCKED,                           \
565          INIT_TRACE_IRQFLAGS                                             \          INIT_TRACE_IRQFLAGS                                             \
# Line 572  diff -ubBpEr linux-2.6.21/include/linux/ Line 572  diff -ubBpEr linux-2.6.21/include/linux/
572    
573    
574  diff -ubBpEr linux-2.6.21/include/linux/sched.h linux-2.6.21-ccs/include/linux/sched.h  diff -ubBpEr linux-2.6.21/include/linux/sched.h linux-2.6.21-ccs/include/linux/sched.h
575  --- linux-2.6.21/include/linux/sched.h  2007-04-28 04:02:41.213049728 +0900  --- linux-2.6.21/include/linux/sched.h  2007-04-28 04:02:41.000000000 +0900
576  +++ linux-2.6.21-ccs/include/linux/sched.h      2007-04-28 04:02:47.878036496 +0900  +++ linux-2.6.21-ccs/include/linux/sched.h      2007-04-28 04:02:47.000000000 +0900
577  @@ -27,6 +27,11 @@  @@ -27,6 +27,11 @@
578   #define CLONE_NEWUTS           0x04000000      /* New utsname group? */   #define CLONE_NEWUTS           0x04000000      /* New utsname group? */
579   #define CLONE_NEWIPC           0x08000000      /* New ipcs */   #define CLONE_NEWIPC           0x08000000      /* New ipcs */
# Line 598  diff -ubBpEr linux-2.6.21/include/linux/ Line 598  diff -ubBpEr linux-2.6.21/include/linux/
598    
599   static inline pid_t process_group(struct task_struct *tsk)   static inline pid_t process_group(struct task_struct *tsk)
600  diff -ubBpEr linux-2.6.21/kernel/kexec.c linux-2.6.21-ccs/kernel/kexec.c  diff -ubBpEr linux-2.6.21/kernel/kexec.c linux-2.6.21-ccs/kernel/kexec.c
601  --- linux-2.6.21/kernel/kexec.c 2007-04-28 04:02:41.214049576 +0900  --- linux-2.6.21/kernel/kexec.c 2007-04-28 04:02:41.000000000 +0900
602  +++ linux-2.6.21-ccs/kernel/kexec.c     2007-04-28 04:02:47.880036192 +0900  +++ linux-2.6.21-ccs/kernel/kexec.c     2007-04-28 04:02:47.000000000 +0900
603  @@ -28,6 +28,9 @@  @@ -28,6 +28,9 @@
604   #include <asm/io.h>   #include <asm/io.h>
605   #include <asm/system.h>   #include <asm/system.h>
# Line 621  diff -ubBpEr linux-2.6.21/kernel/kexec.c Line 621  diff -ubBpEr linux-2.6.21/kernel/kexec.c
621          /*          /*
622           * Verify we have a legal set of flags           * Verify we have a legal set of flags
623  diff -ubBpEr linux-2.6.21/kernel/kmod.c linux-2.6.21-ccs/kernel/kmod.c  diff -ubBpEr linux-2.6.21/kernel/kmod.c linux-2.6.21-ccs/kernel/kmod.c
624  --- linux-2.6.21/kernel/kmod.c  2007-04-28 04:02:41.214049576 +0900  --- linux-2.6.21/kernel/kmod.c  2007-04-28 04:02:41.000000000 +0900
625  +++ linux-2.6.21-ccs/kernel/kmod.c      2007-04-28 04:02:47.881036040 +0900  +++ linux-2.6.21-ccs/kernel/kmod.c      2007-05-16 14:30:01.000000000 +0900
626  @@ -166,6 +166,11 @@ static int ____call_usermodehelper(void  @@ -166,6 +166,11 @@ static int ____call_usermodehelper(void
627          /* We can run anywhere, unlike our parent keventd(). */          /* We can run anywhere, unlike our parent keventd(). */
628          set_cpus_allowed(current, CPU_MASK_ALL);          set_cpus_allowed(current, CPU_MASK_ALL);
# Line 636  diff -ubBpEr linux-2.6.21/kernel/kmod.c Line 636  diff -ubBpEr linux-2.6.21/kernel/kmod.c
636          if (current->fs->root)          if (current->fs->root)
637                  retval = kernel_execve(sub_info->path,                  retval = kernel_execve(sub_info->path,
638  diff -ubBpEr linux-2.6.21/kernel/module.c linux-2.6.21-ccs/kernel/module.c  diff -ubBpEr linux-2.6.21/kernel/module.c linux-2.6.21-ccs/kernel/module.c
639  --- linux-2.6.21/kernel/module.c        2007-04-28 04:02:41.215049424 +0900  --- linux-2.6.21/kernel/module.c        2007-04-28 04:02:41.000000000 +0900
640  +++ linux-2.6.21-ccs/kernel/module.c    2007-04-28 04:02:47.884035584 +0900  +++ linux-2.6.21-ccs/kernel/module.c    2007-04-28 04:02:47.000000000 +0900
641  @@ -44,6 +44,9 @@  @@ -44,6 +44,9 @@
642   #include <asm/semaphore.h>   #include <asm/semaphore.h>
643   #include <asm/cacheflush.h>   #include <asm/cacheflush.h>
# Line 669  diff -ubBpEr linux-2.6.21/kernel/module. Line 669  diff -ubBpEr linux-2.6.21/kernel/module.
669          /* Only one module load at a time, please */          /* Only one module load at a time, please */
670          if (mutex_lock_interruptible(&module_mutex) != 0)          if (mutex_lock_interruptible(&module_mutex) != 0)
671  diff -ubBpEr linux-2.6.21/kernel/sched.c linux-2.6.21-ccs/kernel/sched.c  diff -ubBpEr linux-2.6.21/kernel/sched.c linux-2.6.21-ccs/kernel/sched.c
672  --- linux-2.6.21/kernel/sched.c 2007-04-28 04:02:41.217049120 +0900  --- linux-2.6.21/kernel/sched.c 2007-04-28 04:02:41.000000000 +0900
673  +++ linux-2.6.21-ccs/kernel/sched.c     2007-04-28 04:02:47.893034216 +0900  +++ linux-2.6.21-ccs/kernel/sched.c     2007-04-28 04:02:47.000000000 +0900
674  @@ -55,6 +55,9 @@  @@ -55,6 +55,9 @@
675   #include <asm/tlb.h>   #include <asm/tlb.h>
676    
# Line 692  diff -ubBpEr linux-2.6.21/kernel/sched.c Line 692  diff -ubBpEr linux-2.6.21/kernel/sched.c
692          /*          /*
693           * Setpriority might change our priority at the same moment.           * Setpriority might change our priority at the same moment.
694  diff -ubBpEr linux-2.6.21/kernel/signal.c linux-2.6.21-ccs/kernel/signal.c  diff -ubBpEr linux-2.6.21/kernel/signal.c linux-2.6.21-ccs/kernel/signal.c
695  --- linux-2.6.21/kernel/signal.c        2007-04-28 04:02:41.217049120 +0900  --- linux-2.6.21/kernel/signal.c        2007-04-28 04:02:41.000000000 +0900
696  +++ linux-2.6.21-ccs/kernel/signal.c    2007-04-28 04:02:47.898033456 +0900  +++ linux-2.6.21-ccs/kernel/signal.c    2007-04-28 04:02:47.000000000 +0900
697  @@ -32,6 +32,9 @@  @@ -32,6 +32,9 @@
698   #include <asm/unistd.h>   #include <asm/unistd.h>
699   #include <asm/siginfo.h>   #include <asm/siginfo.h>
# Line 738  diff -ubBpEr linux-2.6.21/kernel/signal. Line 738  diff -ubBpEr linux-2.6.21/kernel/signal.
738          return do_tkill(0, pid, sig);          return do_tkill(0, pid, sig);
739   }   }
740  diff -ubBpEr linux-2.6.21/kernel/sys.c linux-2.6.21-ccs/kernel/sys.c  diff -ubBpEr linux-2.6.21/kernel/sys.c linux-2.6.21-ccs/kernel/sys.c
741  --- linux-2.6.21/kernel/sys.c   2007-04-28 04:02:41.218048968 +0900  --- linux-2.6.21/kernel/sys.c   2007-04-28 04:02:41.000000000 +0900
742  +++ linux-2.6.21-ccs/kernel/sys.c       2007-04-28 04:02:47.901033000 +0900  +++ linux-2.6.21-ccs/kernel/sys.c       2007-04-28 04:02:47.000000000 +0900
743  @@ -37,6 +37,9 @@  @@ -37,6 +37,9 @@
744   #include <asm/uaccess.h>   #include <asm/uaccess.h>
745   #include <asm/io.h>   #include <asm/io.h>
# Line 791  diff -ubBpEr linux-2.6.21/kernel/sys.c l Line 791  diff -ubBpEr linux-2.6.21/kernel/sys.c l
791          down_write(&uts_sem);          down_write(&uts_sem);
792          errno = -EFAULT;          errno = -EFAULT;
793  diff -ubBpEr linux-2.6.21/kernel/sysctl.c linux-2.6.21-ccs/kernel/sysctl.c  diff -ubBpEr linux-2.6.21/kernel/sysctl.c linux-2.6.21-ccs/kernel/sysctl.c
794  --- linux-2.6.21/kernel/sysctl.c        2007-04-28 04:02:41.219048816 +0900  --- linux-2.6.21/kernel/sysctl.c        2007-04-28 04:02:41.000000000 +0900
795  +++ linux-2.6.21-ccs/kernel/sysctl.c    2007-04-28 04:02:47.905032392 +0900  +++ linux-2.6.21-ccs/kernel/sysctl.c    2007-04-28 04:02:47.000000000 +0900
796  @@ -48,6 +48,9 @@  @@ -48,6 +48,9 @@
797    
798   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 896  diff -ubBpEr linux-2.6.21/kernel/sysctl. Line 896  diff -ubBpEr linux-2.6.21/kernel/sysctl.
896                                          newval, newlen, head->ctl_table);                                          newval, newlen, head->ctl_table);
897                  if (error != -ENOTDIR) {                  if (error != -ENOTDIR) {
898  diff -ubBpEr linux-2.6.21/kernel/time/ntp.c linux-2.6.21-ccs/kernel/time/ntp.c  diff -ubBpEr linux-2.6.21/kernel/time/ntp.c linux-2.6.21-ccs/kernel/time/ntp.c
899  --- linux-2.6.21/kernel/time/ntp.c      2007-04-28 04:02:41.219048816 +0900  --- linux-2.6.21/kernel/time/ntp.c      2007-04-28 04:02:41.000000000 +0900
900  +++ linux-2.6.21-ccs/kernel/time/ntp.c  2007-04-28 04:02:47.906032240 +0900  +++ linux-2.6.21-ccs/kernel/time/ntp.c  2007-04-28 04:02:47.000000000 +0900
901  @@ -14,6 +14,9 @@  @@ -14,6 +14,9 @@
902    
903   #include <asm/div64.h>   #include <asm/div64.h>
# Line 919  diff -ubBpEr linux-2.6.21/kernel/time/nt Line 919  diff -ubBpEr linux-2.6.21/kernel/time/nt
919          /* Now we validate the data before disabling interrupts */          /* Now we validate the data before disabling interrupts */
920    
921  diff -ubBpEr linux-2.6.21/kernel/time.c linux-2.6.21-ccs/kernel/time.c  diff -ubBpEr linux-2.6.21/kernel/time.c linux-2.6.21-ccs/kernel/time.c
922  --- linux-2.6.21/kernel/time.c  2007-04-28 04:02:41.219048816 +0900  --- linux-2.6.21/kernel/time.c  2007-04-28 04:02:41.000000000 +0900
923  +++ linux-2.6.21-ccs/kernel/time.c      2007-04-28 04:02:47.908031936 +0900  +++ linux-2.6.21-ccs/kernel/time.c      2007-04-28 04:02:47.000000000 +0900
924  @@ -39,6 +39,9 @@  @@ -39,6 +39,9 @@
925    
926   #include <asm/uaccess.h>   #include <asm/uaccess.h>
# Line 952  diff -ubBpEr linux-2.6.21/kernel/time.c Line 952  diff -ubBpEr linux-2.6.21/kernel/time.c
952          if (tz) {          if (tz) {
953                  /* SMP safe, global irq locking makes it work. */                  /* SMP safe, global irq locking makes it work. */
954  diff -ubBpEr linux-2.6.21/net/ipv4/inet_connection_sock.c linux-2.6.21-ccs/net/ipv4/inet_connection_sock.c  diff -ubBpEr linux-2.6.21/net/ipv4/inet_connection_sock.c linux-2.6.21-ccs/net/ipv4/inet_connection_sock.c
955  --- linux-2.6.21/net/ipv4/inet_connection_sock.c        2007-04-28 04:02:41.219048816 +0900  --- linux-2.6.21/net/ipv4/inet_connection_sock.c        2007-04-28 04:02:41.000000000 +0900
956  +++ linux-2.6.21-ccs/net/ipv4/inet_connection_sock.c    2007-04-28 04:02:47.910031632 +0900  +++ linux-2.6.21-ccs/net/ipv4/inet_connection_sock.c    2007-04-28 04:02:47.000000000 +0900
957  @@ -23,6 +23,9 @@  @@ -23,6 +23,9 @@
958   #include <net/route.h>   #include <net/route.h>
959   #include <net/tcp_states.h>   #include <net/tcp_states.h>
# Line 975  diff -ubBpEr linux-2.6.21/net/ipv4/inet_ Line 975  diff -ubBpEr linux-2.6.21/net/ipv4/inet_
975                                  if (tb->port == rover)                                  if (tb->port == rover)
976                                          goto next;                                          goto next;
977  diff -ubBpEr linux-2.6.21/net/ipv4/inet_hashtables.c linux-2.6.21-ccs/net/ipv4/inet_hashtables.c  diff -ubBpEr linux-2.6.21/net/ipv4/inet_hashtables.c linux-2.6.21-ccs/net/ipv4/inet_hashtables.c
978  --- linux-2.6.21/net/ipv4/inet_hashtables.c     2007-04-28 04:02:41.219048816 +0900  --- linux-2.6.21/net/ipv4/inet_hashtables.c     2007-04-28 04:02:41.000000000 +0900
979  +++ linux-2.6.21-ccs/net/ipv4/inet_hashtables.c 2007-04-28 04:02:47.911031480 +0900  +++ linux-2.6.21-ccs/net/ipv4/inet_hashtables.c 2007-04-28 04:02:47.000000000 +0900
980  @@ -22,6 +22,9 @@  @@ -22,6 +22,9 @@
981   #include <net/inet_connection_sock.h>   #include <net/inet_connection_sock.h>
982   #include <net/inet_hashtables.h>   #include <net/inet_hashtables.h>
# Line 998  diff -ubBpEr linux-2.6.21/net/ipv4/inet_ Line 998  diff -ubBpEr linux-2.6.21/net/ipv4/inet_
998                          spin_lock(&head->lock);                          spin_lock(&head->lock);
999    
1000  diff -ubBpEr linux-2.6.21/net/ipv4/udp.c linux-2.6.21-ccs/net/ipv4/udp.c  diff -ubBpEr linux-2.6.21/net/ipv4/udp.c linux-2.6.21-ccs/net/ipv4/udp.c
1001  --- linux-2.6.21/net/ipv4/udp.c 2007-04-28 04:02:41.219048816 +0900  --- linux-2.6.21/net/ipv4/udp.c 2007-04-28 04:02:41.000000000 +0900
1002  +++ linux-2.6.21-ccs/net/ipv4/udp.c     2007-04-28 04:02:47.913031176 +0900  +++ linux-2.6.21-ccs/net/ipv4/udp.c     2007-05-23 14:50:12.091978392 +0900
1003  @@ -102,6 +102,9 @@  @@ -102,6 +102,9 @@
1004   #include <net/checksum.h>   #include <net/checksum.h>
1005   #include <net/xfrm.h>   #include <net/xfrm.h>
# Line 1010  diff -ubBpEr linux-2.6.21/net/ipv4/udp.c Line 1010  diff -ubBpEr linux-2.6.21/net/ipv4/udp.c
1010    
1011   /*   /*
1012    *     Snmp MIB for the UDP layer    *     Snmp MIB for the UDP layer
1013  @@ -155,6 +158,9 @@ int __udp_lib_get_port(struct sock *sk,  @@ -162,6 +165,9 @@ int __udp_lib_get_port(struct sock *sk,
1014                  best = result = *port_rover;                                          result = sysctl_local_port_range[0] +
1015                  for (i = 0; i < UDP_HTABLE_SIZE; i++, result++) {                                                  ((result - sysctl_local_port_range[0]) &
1016                          int size;                                                   (UDP_HTABLE_SIZE - 1));
1017  +                       /***** SAKURA Linux start. *****/  +                               /***** SAKURA Linux start. *****/
1018  +                       if (SAKURA_MayAutobind(result) < 0) continue;  +                               if (SAKURA_MayAutobind(result) < 0) continue;
1019  +                       /***** SAKURA Linux end. *****/  +                               /***** SAKURA Linux end. *****/
1020                                    goto gotit;
1021                          head = &udptable[result & (UDP_HTABLE_SIZE - 1)];                          }
1022                          if (hlist_empty(head)) {                          size = 0;
1023  @@ -180,6 +186,9 @@ int __udp_lib_get_port(struct sock *sk,  @@ -180,6 +186,9 @@ int __udp_lib_get_port(struct sock *sk,
1024                                  result = sysctl_local_port_range[0]                                  result = sysctl_local_port_range[0]
1025                                          + ((result - sysctl_local_port_range[0]) &                                          + ((result - sysctl_local_port_range[0]) &
# Line 1031  diff -ubBpEr linux-2.6.21/net/ipv4/udp.c Line 1031  diff -ubBpEr linux-2.6.21/net/ipv4/udp.c
1031                                  break;                                  break;
1032                  }                  }
1033  diff -ubBpEr linux-2.6.21/net/ipv6/inet6_hashtables.c linux-2.6.21-ccs/net/ipv6/inet6_hashtables.c  diff -ubBpEr linux-2.6.21/net/ipv6/inet6_hashtables.c linux-2.6.21-ccs/net/ipv6/inet6_hashtables.c
1034  --- linux-2.6.21/net/ipv6/inet6_hashtables.c    2007-04-28 04:02:41.219048816 +0900  --- linux-2.6.21/net/ipv6/inet6_hashtables.c    2007-04-28 04:02:41.000000000 +0900
1035  +++ linux-2.6.21-ccs/net/ipv6/inet6_hashtables.c        2007-04-28 04:02:47.915030872 +0900  +++ linux-2.6.21-ccs/net/ipv6/inet6_hashtables.c        2007-04-28 04:02:47.000000000 +0900
1036  @@ -21,6 +21,9 @@  @@ -21,6 +21,9 @@
1037   #include <net/inet_hashtables.h>   #include <net/inet_hashtables.h>
1038   #include <net/inet6_hashtables.h>   #include <net/inet6_hashtables.h>
# Line 1054  diff -ubBpEr linux-2.6.21/net/ipv6/inet6 Line 1054  diff -ubBpEr linux-2.6.21/net/ipv6/inet6
1054                          spin_lock(&head->lock);                          spin_lock(&head->lock);
1055    
1056  diff -ubBpEr linux-2.6.21/net/socket.c linux-2.6.21-ccs/net/socket.c  diff -ubBpEr linux-2.6.21/net/socket.c linux-2.6.21-ccs/net/socket.c
1057  --- linux-2.6.21/net/socket.c   2007-04-28 04:02:41.220048664 +0900  --- linux-2.6.21/net/socket.c   2007-04-28 04:02:41.000000000 +0900
1058  +++ linux-2.6.21-ccs/net/socket.c       2007-04-28 04:02:47.916030720 +0900  +++ linux-2.6.21-ccs/net/socket.c       2007-04-28 04:02:47.000000000 +0900
1059  @@ -93,6 +93,11 @@  @@ -93,6 +93,11 @@
1060   #include <net/sock.h>   #include <net/sock.h>
1061   #include <linux/netfilter.h>   #include <linux/netfilter.h>
# Line 1146  diff -ubBpEr linux-2.6.21/net/socket.c l Line 1146  diff -ubBpEr linux-2.6.21/net/socket.c l
1146          err = sock->ops->connect(sock, (struct sockaddr *)address, addrlen,          err = sock->ops->connect(sock, (struct sockaddr *)address, addrlen,
1147                                   sock->file->f_flags);                                   sock->file->f_flags);
1148  diff -ubBpEr linux-2.6.21/net/unix/af_unix.c linux-2.6.21-ccs/net/unix/af_unix.c  diff -ubBpEr linux-2.6.21/net/unix/af_unix.c linux-2.6.21-ccs/net/unix/af_unix.c
1149  --- linux-2.6.21/net/unix/af_unix.c     2007-04-28 04:02:41.220048664 +0900  --- linux-2.6.21/net/unix/af_unix.c     2007-04-28 04:02:41.000000000 +0900
1150  +++ linux-2.6.21-ccs/net/unix/af_unix.c 2007-04-28 04:02:47.917030568 +0900  +++ linux-2.6.21-ccs/net/unix/af_unix.c 2007-04-28 04:02:47.000000000 +0900
1151  @@ -116,6 +116,9 @@  @@ -116,6 +116,9 @@
1152   #include <linux/mount.h>   #include <linux/mount.h>
1153   #include <net/checksum.h>   #include <net/checksum.h>
Legend:
Removed from v.212  
changed lines
  Added in v.237
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
サイト情報
ソフトウェアを探す
ソフトウェアを作る
コミュニティ
ヘルプ