packages (LINUX_3_0): kernel/kernel-grsec-common.patch, kernel/kernel-grsec...

arekm arekm at pld-linux.org
Tue Nov 22 10:50:59 CET 2011


Author: arekm                        Date: Tue Nov 22 09:50:59 2011 GMT
Module: packages                      Tag: LINUX_3_0
---- Log message:
- up to 3.0.10

---- Files affected:
packages/kernel:
   kernel-grsec-common.patch (1.4 -> 1.4.4.1) , kernel-grsec_full.patch (1.85.2.4 -> 1.85.2.5) , kernel-unionfs.patch (1.14 -> 1.14.2.1) , kernel-vserver-2.3.patch (1.83.2.2 -> 1.83.2.3) , kernel.spec (1.987.2.8 -> 1.987.2.9) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-grsec-common.patch
diff -u packages/kernel/kernel-grsec-common.patch:1.4 packages/kernel/kernel-grsec-common.patch:1.4.4.1
--- packages/kernel/kernel-grsec-common.patch:1.4	Wed Feb 23 11:59:34 2011
+++ packages/kernel/kernel-grsec-common.patch	Tue Nov 22 10:50:50 2011
@@ -25,15 +25,4 @@
 ===
 === analogous as capable()
 ===
---- linux-2.6.37/kernel/capability.c~	2011-02-23 10:36:01.806613056 +0100
-+++ linux-2.6.37/kernel/capability.c	2011-02-23 10:53:44.781787616 +0100
-@@ -325,6 +325,9 @@
- 
- int capable_nolog(int cap)
- {
-+	/* here for now so we don't require task locking */
-+	if (vs_check_bit(VXC_CAP_MASK, cap) && !vx_mcaps(1L << cap))
-+		return 0;
- 	if (unlikely(!cap_valid(cap))) {
- 		printk(KERN_CRIT "capable() called with invalid cap=%u\n", cap);
- 		BUG();
+

================================================================
Index: packages/kernel/kernel-grsec_full.patch
diff -u packages/kernel/kernel-grsec_full.patch:1.85.2.4 packages/kernel/kernel-grsec_full.patch:1.85.2.5
--- packages/kernel/kernel-grsec_full.patch:1.85.2.4	Fri Nov 18 11:47:58 2011
+++ packages/kernel/kernel-grsec_full.patch	Tue Nov 22 10:50:50 2011
@@ -26954,10 +26954,10 @@
  
  		if (chan->fence.sequence_ack == sequence)
  			goto out;
-@@ -544,7 +544,7 @@ nouveau_fence_channel_init(struct nouvea
+@@ -542,7 +542,7 @@ nouveau_fence_channel_init(struct nouvea
+ 			return ret;
+ 	}
  
- 	INIT_LIST_HEAD(&chan->fence.pending);
- 	spin_lock_init(&chan->fence.lock);
 -	atomic_set(&chan->fence.last_sequence_irq, 0);
 +	atomic_set_unchecked(&chan->fence.last_sequence_irq, 0);
  	return 0;

================================================================
Index: packages/kernel/kernel-unionfs.patch
diff -u packages/kernel/kernel-unionfs.patch:1.14 packages/kernel/kernel-unionfs.patch:1.14.2.1
--- packages/kernel/kernel-unionfs.patch:1.14	Mon Jul 11 21:51:13 2011
+++ packages/kernel/kernel-unionfs.patch	Tue Nov 22 10:50:51 2011
@@ -532,10 +532,10 @@
 +
 +For more information, see <http://unionfs.filesystems.org/>.
 diff --git a/MAINTAINERS b/MAINTAINERS
-index f0358cd..7ae0669 100644
+index 187282d..f77de31 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -6375,6 +6375,14 @@ F:	Documentation/cdrom/
+@@ -6386,6 +6386,14 @@ F:	Documentation/cdrom/
  F:	drivers/cdrom/cdrom.c
  F:	include/linux/cdrom.h
  
@@ -575,10 +575,10 @@
  obj-$(CONFIG_NFS_FS)		+= nfs/
  obj-$(CONFIG_EXPORTFS)		+= exportfs/
 diff --git a/fs/namei.c b/fs/namei.c
-index 0223c41..5d0261e 100644
+index 14ab8d3..9b73afa 100644
 --- a/fs/namei.c
 +++ b/fs/namei.c
-@@ -484,6 +484,7 @@ void release_open_intent(struct nameidata *nd)
+@@ -486,6 +486,7 @@ void release_open_intent(struct nameidata *nd)
  			fput(file);
  	}
  }
@@ -586,7 +586,7 @@
  
  static inline int d_revalidate(struct dentry *dentry, struct nameidata *nd)
  {
-@@ -1740,6 +1741,42 @@ struct dentry *lookup_one_len(const char *name, struct dentry *base, int len)
+@@ -1747,6 +1748,42 @@ struct dentry *lookup_one_len(const char *name, struct dentry *base, int len)
  	return __lookup_hash(&this, base, NULL);
  }
  
@@ -629,7 +629,7 @@
  int user_path_at(int dfd, const char __user *name, unsigned flags,
  		 struct path *path)
  {
-@@ -3339,6 +3376,7 @@ EXPORT_SYMBOL(get_write_access); /* binfmt_aout */
+@@ -3346,6 +3383,7 @@ EXPORT_SYMBOL(get_write_access); /* binfmt_aout */
  EXPORT_SYMBOL(getname);
  EXPORT_SYMBOL(lock_rename);
  EXPORT_SYMBOL(lookup_one_len);
@@ -774,11 +774,11 @@
 +	  If you say Y here, you can turn on debugging output from Unionfs.
 diff --git a/fs/unionfs/Makefile b/fs/unionfs/Makefile
 new file mode 100644
-index 0000000..0ece303
+index 0000000..a1e4354
 --- /dev/null
 +++ b/fs/unionfs/Makefile
 @@ -0,0 +1,17 @@
-+UNIONFS_VERSION="2.5.9.2 (for 3.0.0-rc4)"
++UNIONFS_VERSION="2.5.10 (for 3.0.4)"
 +
 +EXTRA_CFLAGS += -DUNIONFS_VERSION=\"$(UNIONFS_VERSION)\"
 +
@@ -797,7 +797,7 @@
 +endif
 diff --git a/fs/unionfs/commonfops.c b/fs/unionfs/commonfops.c
 new file mode 100644
-index 0000000..0a271f4
+index 0000000..cd5c304
 --- /dev/null
 +++ b/fs/unionfs/commonfops.c
 @@ -0,0 +1,896 @@
@@ -1115,7 +1115,7 @@
 +	 * someone has copied up this file from underneath us, we also need
 +	 * to refresh things.
 +	 */
-+	if ((d_deleted(dentry) && dbstart(dentry) >= fbstart(file)) ||
++	if (d_deleted(dentry) ||
 +	    (sbgen <= fgen &&
 +	     dbstart(dentry) == fbstart(file) &&
 +	     unionfs_lower_file(file)))
@@ -2601,10 +2601,10 @@
 +}
 diff --git a/fs/unionfs/debug.c b/fs/unionfs/debug.c
 new file mode 100644
-index 0000000..6092e69
+index 0000000..c07f697
 --- /dev/null
 +++ b/fs/unionfs/debug.c
-@@ -0,0 +1,548 @@
+@@ -0,0 +1,549 @@
 +/*
 + * Copyright (c) 2003-2011 Erez Zadok
 + * Copyright (c) 2005-2007 Josef 'Jeff' Sipek
@@ -2969,12 +2969,13 @@
 +		pr_debug(" CF0: file/dentry=%p:%p fstart/end=%d:%d\n",
 +			 file, dentry, fstart, fend);
 +	}
-+	if (unlikely(fstart != dstart)) {
++	/* d_deleted dentries can be ignored for this test */
++	if (unlikely(fstart != dstart) && !d_deleted(dentry)) {
 +		PRINT_CALLER(fname, fxn, line);
 +		pr_debug(" CF1: file/dentry=%p:%p fstart=%d dstart=%d\n",
 +			 file, dentry, fstart, dstart);
 +	}
-+	if (unlikely(fend != dend)) {
++	if (unlikely(fend != dend) && !d_deleted(dentry)) {
 +		PRINT_CALLER(fname, fxn, line);
 +		pr_debug(" CF2: file/dentry=%p:%p fend=%d dend=%d\n",
 +			 file, dentry, fend, dend);
@@ -3155,10 +3156,10 @@
 +}
 diff --git a/fs/unionfs/dentry.c b/fs/unionfs/dentry.c
 new file mode 100644
-index 0000000..c0205a4
+index 0000000..1628dad
 --- /dev/null
 +++ b/fs/unionfs/dentry.c
-@@ -0,0 +1,406 @@
+@@ -0,0 +1,409 @@
 +/*
 + * Copyright (c) 2003-2011 Erez Zadok
 + * Copyright (c) 2003-2006 Charles P. Wright
@@ -3476,12 +3477,15 @@
 +}
 +
 +static int unionfs_d_revalidate(struct dentry *dentry,
-+				struct nameidata *nd_unused)
++				struct nameidata *nd)
 +{
 +	bool valid = true;
 +	int err = 1;		/* 1 means valid for the VFS */
 +	struct dentry *parent;
 +
++	if (nd && nd->flags & LOOKUP_RCU)
++		return -ECHILD;
++
 +	unionfs_read_lock(dentry->d_sb, UNIONFS_SMUTEX_CHILD);
 +	parent = unionfs_lock_parent(dentry, UNIONFS_DMUTEX_PARENT);
 +	unionfs_lock_dentry(dentry, UNIONFS_DMUTEX_CHILD);
@@ -5945,10 +5949,10 @@
 +};
 diff --git a/fs/unionfs/lookup.c b/fs/unionfs/lookup.c
 new file mode 100644
-index 0000000..3cbde56
+index 0000000..9040394
 --- /dev/null
 +++ b/fs/unionfs/lookup.c
-@@ -0,0 +1,569 @@
+@@ -0,0 +1,570 @@
 +/*
 + * Copyright (c) 2003-2011 Erez Zadok
 + * Copyright (c) 2003-2006 Charles P. Wright
@@ -6262,7 +6266,8 @@
 +	verify_locked(parent);
 +
 +	/* must initialize dentry operations */
-+	dentry->d_op = &unionfs_dops;
++	if (lookupmode == INTERPOSE_LOOKUP)
++		d_set_d_op(dentry, &unionfs_dops);
 +
 +	/* We never partial lookup the root directory. */
 +	if (IS_ROOT(dentry))
@@ -6520,7 +6525,7 @@
 +}
 diff --git a/fs/unionfs/main.c b/fs/unionfs/main.c
 new file mode 100644
-index 0000000..fa52f61
+index 0000000..f4bcd89
 --- /dev/null
 +++ b/fs/unionfs/main.c
 @@ -0,0 +1,763 @@
@@ -6671,7 +6676,7 @@
 +			 * properly.  Finally we must return this new
 +			 * dentry.
 +			 */
-+			spliced->d_op = &unionfs_dops;
++			d_set_d_op(spliced, &unionfs_dops);
 +			spliced->d_fsdata = dentry->d_fsdata;
 +			dentry->d_fsdata = NULL;
 +			dentry = spliced;
@@ -7069,7 +7074,7 @@
 +
 +		ret = d_alloc(NULL, &name);
 +		if (likely(ret)) {
-+			ret->d_op = &unionfs_dops;
++			d_set_d_op(ret, &unionfs_dops);
 +			ret->d_sb = sb;
 +			ret->d_parent = ret;
 +		}
@@ -9544,10 +9549,10 @@
 +};
 diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h
 new file mode 100644
-index 0000000..1821705
+index 0000000..16df291
 --- /dev/null
 +++ b/fs/unionfs/union.h
-@@ -0,0 +1,679 @@
+@@ -0,0 +1,680 @@
 +/*
 + * Copyright (c) 2003-2011 Erez Zadok
 + * Copyright (c) 2003-2006 Charles P. Wright
@@ -10223,6 +10228,7 @@
 +#define show_inode_times(i)		do { } while (0)
 +#define show_dinode_times(d)		do { } while (0)
 +#define show_inode_counts(i)		do { } while (0)
++#define UDBG				do { } while (0)
 +
 +#endif /* not CONFIG_UNION_FS_DEBUG */
 +

================================================================
Index: packages/kernel/kernel-vserver-2.3.patch
diff -u packages/kernel/kernel-vserver-2.3.patch:1.83.2.2 packages/kernel/kernel-vserver-2.3.patch:1.83.2.3
--- packages/kernel/kernel-vserver-2.3.patch:1.83.2.2	Fri Nov 11 22:50:31 2011
+++ packages/kernel/kernel-vserver-2.3.patch	Tue Nov 22 10:50:51 2011
@@ -1,1630 +1,6 @@
-diff -NurpP --minimal linux-3.0.7/.config.inet linux-3.0.7-vs2.3.1/.config.inet
---- linux-3.0.7/.config.inet	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.7-vs2.3.1/.config.inet	2011-06-13 14:55:18.000000000 +0200
-@@ -0,0 +1,1620 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux/x86_64 3.0.0-rc2-vs2.3.x Kernel Configuration
-+#
-+CONFIG_64BIT=y
-+# CONFIG_X86_32 is not set
-+CONFIG_X86_64=y
-+CONFIG_X86=y
-+CONFIG_INSTRUCTION_DECODER=y
-+CONFIG_OUTPUT_FORMAT="elf64-x86-64"
-+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
-+CONFIG_GENERIC_CMOS_UPDATE=y
-+CONFIG_CLOCKSOURCE_WATCHDOG=y
-+CONFIG_GENERIC_CLOCKEVENTS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-+CONFIG_LOCKDEP_SUPPORT=y
-+CONFIG_STACKTRACE_SUPPORT=y
-+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-+CONFIG_MMU=y
-+CONFIG_ZONE_DMA=y
-+CONFIG_NEED_DMA_MAP_STATE=y
-+CONFIG_NEED_SG_DMA_LENGTH=y
-+CONFIG_GENERIC_ISA_DMA=y
-+CONFIG_GENERIC_IOMAP=y
-+CONFIG_GENERIC_BUG=y
-+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-+# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
-+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_GENERIC_TIME_VSYSCALL=y
-+CONFIG_ARCH_HAS_CPU_RELAX=y
-+CONFIG_ARCH_HAS_DEFAULT_IDLE=y
-+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
-+CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y
-+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-+CONFIG_ARCH_SUSPEND_POSSIBLE=y
-+CONFIG_ZONE_DMA32=y
-+CONFIG_ARCH_POPULATES_NODE_MAP=y
-+CONFIG_AUDIT_ARCH=y
-+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
-+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-+CONFIG_X86_64_SMP=y
-+CONFIG_X86_HT=y
-+CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
-+# CONFIG_KTIME_SCALAR is not set
-+CONFIG_ARCH_CPU_PROBE_RELEASE=y
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+CONFIG_CONSTRUCTORS=y
-+CONFIG_HAVE_IRQ_WORK=y
-+CONFIG_IRQ_WORK=y
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_CROSS_COMPILE=""
-+CONFIG_LOCALVERSION=""
-+# CONFIG_LOCALVERSION_AUTO is not set
-+CONFIG_HAVE_KERNEL_GZIP=y
-+CONFIG_HAVE_KERNEL_BZIP2=y
-+CONFIG_HAVE_KERNEL_LZMA=y
-+CONFIG_HAVE_KERNEL_XZ=y
-+CONFIG_HAVE_KERNEL_LZO=y
-+# CONFIG_KERNEL_GZIP is not set
-+# CONFIG_KERNEL_BZIP2 is not set
-+CONFIG_KERNEL_LZMA=y
-+# CONFIG_KERNEL_XZ is not set
-+# CONFIG_KERNEL_LZO is not set
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+CONFIG_POSIX_MQUEUE=y
-+CONFIG_POSIX_MQUEUE_SYSCTL=y
-+CONFIG_BSD_PROCESS_ACCT=y
-+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-+# CONFIG_FHANDLE is not set
-+CONFIG_TASKSTATS=y
-+CONFIG_TASK_DELAY_ACCT=y
-+CONFIG_TASK_XACCT=y
-+CONFIG_TASK_IO_ACCOUNTING=y
-+# CONFIG_AUDIT is not set
-+CONFIG_HAVE_GENERIC_HARDIRQS=y
-+
-+#
-+# IRQ subsystem
-+#
-+CONFIG_GENERIC_HARDIRQS=y
-+CONFIG_HAVE_SPARSE_IRQ=y
-+CONFIG_GENERIC_IRQ_PROBE=y
-+CONFIG_GENERIC_IRQ_SHOW=y
-+CONFIG_GENERIC_PENDING_IRQ=y
-+CONFIG_IRQ_FORCED_THREADING=y
-+# CONFIG_SPARSE_IRQ is not set
-+
-+#
-+# RCU Subsystem
-+#
-+CONFIG_TREE_RCU=y
-+# CONFIG_PREEMPT_RCU is not set
-+# CONFIG_RCU_TRACE is not set
-+CONFIG_RCU_FANOUT=64
-+# CONFIG_RCU_FANOUT_EXACT is not set
-+# CONFIG_TREE_RCU_TRACE is not set
-+CONFIG_IKCONFIG=y
-+CONFIG_IKCONFIG_PROC=y
-+CONFIG_LOG_BUF_SHIFT=18
-+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-+CONFIG_CGROUPS=y
-+# CONFIG_CGROUP_DEBUG is not set
-+# CONFIG_CGROUP_FREEZER is not set
-+# CONFIG_CGROUP_DEVICE is not set
-+# CONFIG_CPUSETS is not set
-+# CONFIG_CGROUP_CPUACCT is not set
-+CONFIG_RESOURCE_COUNTERS=y
-+CONFIG_CGROUP_MEM_RES_CTLR=y
-+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
-+CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED=y
-+# CONFIG_CGROUP_PERF is not set
-+CONFIG_CGROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+# CONFIG_BLK_CGROUP is not set
-+CONFIG_NAMESPACES=y
-+CONFIG_UTS_NS=y
-+CONFIG_IPC_NS=y
-+CONFIG_USER_NS=y
-+# CONFIG_PID_NS is not set
-+# CONFIG_NET_NS is not set
-+CONFIG_SCHED_AUTOGROUP=y
-+CONFIG_MM_OWNER=y
-+# CONFIG_SYSFS_DEPRECATED is not set
-+# CONFIG_RELAY is not set
-+# CONFIG_BLK_DEV_INITRD is not set
-+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-+CONFIG_SYSCTL=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EXPERT=y
-+CONFIG_UID16=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+CONFIG_KALLSYMS_ALL=y
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_PCSPKR_PLATFORM=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_AIO=y
-+# CONFIG_EMBEDDED is not set
-+CONFIG_HAVE_PERF_EVENTS=y
-+
-+#
-+# Kernel Performance Events And Counters
-+#
-+CONFIG_PERF_EVENTS=y
-+# CONFIG_PERF_COUNTERS is not set
-+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_PCI_QUIRKS=y
-+CONFIG_SLUB_DEBUG=y
-+# CONFIG_COMPAT_BRK is not set
-+# CONFIG_SLAB is not set
-+CONFIG_SLUB=y
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_JUMP_LABEL is not set
-+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-+CONFIG_HAVE_IOREMAP_PROT=y
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_HAVE_OPTPROBES=y
-+CONFIG_HAVE_ARCH_TRACEHOOK=y
-+CONFIG_HAVE_DMA_ATTRS=y
-+CONFIG_USE_GENERIC_SMP_HELPERS=y
-+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-+CONFIG_HAVE_DMA_API_DEBUG=y
-+CONFIG_HAVE_HW_BREAKPOINT=y
-+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
-+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
-+CONFIG_HAVE_PERF_EVENTS_NMI=y
-+CONFIG_HAVE_ARCH_JUMP_LABEL=y
-+
-+#
-+# GCOV-based kernel profiling
-+#
-+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+CONFIG_BASE_SMALL=0
-+# CONFIG_MODULES is not set
-+CONFIG_STOP_MACHINE=y
-+CONFIG_BLOCK=y
-+# CONFIG_BLK_DEV_BSG is not set
-+# CONFIG_BLK_DEV_INTEGRITY is not set
-+CONFIG_BLOCK_COMPAT=y
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+# CONFIG_IOSCHED_DEADLINE is not set
-+CONFIG_IOSCHED_CFQ=y
-+CONFIG_DEFAULT_CFQ=y
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="cfq"
-+# CONFIG_INLINE_SPIN_TRYLOCK is not set
-+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-+# CONFIG_INLINE_SPIN_LOCK is not set
-+# CONFIG_INLINE_SPIN_LOCK_BH is not set
-+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-+CONFIG_INLINE_SPIN_UNLOCK=y
-+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-+# CONFIG_INLINE_READ_TRYLOCK is not set
-+# CONFIG_INLINE_READ_LOCK is not set
-+# CONFIG_INLINE_READ_LOCK_BH is not set
-+# CONFIG_INLINE_READ_LOCK_IRQ is not set
-+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-+CONFIG_INLINE_READ_UNLOCK=y
-+# CONFIG_INLINE_READ_UNLOCK_BH is not set
-+CONFIG_INLINE_READ_UNLOCK_IRQ=y
-+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-+# CONFIG_INLINE_WRITE_TRYLOCK is not set
-+# CONFIG_INLINE_WRITE_LOCK is not set
-+# CONFIG_INLINE_WRITE_LOCK_BH is not set
-+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-+CONFIG_INLINE_WRITE_UNLOCK=y
-+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-+CONFIG_MUTEX_SPIN_ON_OWNER=y
-+CONFIG_FREEZER=y
-+
-+#
-+# Processor type and features
-+#
-+CONFIG_TICK_ONESHOT=y
-+# CONFIG_NO_HZ is not set
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-+CONFIG_SMP=y
-+CONFIG_X86_MPPARSE=y
-+# CONFIG_X86_EXTENDED_PLATFORM is not set
-+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
-+CONFIG_SCHED_OMIT_FRAME_POINTER=y
-+# CONFIG_PARAVIRT_GUEST is not set
-+CONFIG_NO_BOOTMEM=y
-+# CONFIG_MEMTEST is not set
-+# CONFIG_MK8 is not set
-+# CONFIG_MPSC is not set
-+CONFIG_MCORE2=y
-+# CONFIG_MATOM is not set
-+# CONFIG_GENERIC_CPU is not set
-+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-+CONFIG_X86_CMPXCHG=y
-+CONFIG_CMPXCHG_LOCAL=y
-+CONFIG_X86_L1_CACHE_SHIFT=6
-+CONFIG_X86_XADD=y
-+CONFIG_X86_WP_WORKS_OK=y
-+CONFIG_X86_INTEL_USERCOPY=y
-+CONFIG_X86_USE_PPRO_CHECKSUM=y
-+CONFIG_X86_P6_NOP=y
-+CONFIG_X86_TSC=y
-+CONFIG_X86_CMPXCHG64=y
-+CONFIG_X86_CMOV=y
-+CONFIG_X86_MINIMUM_CPU_FAMILY=64
-+CONFIG_X86_DEBUGCTLMSR=y
-+# CONFIG_PROCESSOR_SELECT is not set
-+CONFIG_CPU_SUP_INTEL=y
-+CONFIG_CPU_SUP_AMD=y
-+CONFIG_CPU_SUP_CENTAUR=y
-+CONFIG_HPET_TIMER=y
-+CONFIG_HPET_EMULATE_RTC=y
-+CONFIG_DMI=y
-+CONFIG_GART_IOMMU=y
-+# CONFIG_CALGARY_IOMMU is not set
-+# CONFIG_AMD_IOMMU is not set
-+CONFIG_SWIOTLB=y
-+CONFIG_IOMMU_HELPER=y
-+# CONFIG_IOMMU_API is not set
-+# CONFIG_MAXSMP is not set
-+CONFIG_NR_CPUS=32
-+CONFIG_SCHED_SMT=y
-+CONFIG_SCHED_MC=y
-+# CONFIG_IRQ_TIME_ACCOUNTING is not set
-+CONFIG_PREEMPT_NONE=y
-+# CONFIG_PREEMPT_VOLUNTARY is not set
-+# CONFIG_PREEMPT is not set
-+CONFIG_X86_LOCAL_APIC=y
-+CONFIG_X86_IO_APIC=y
-+# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
-+CONFIG_X86_MCE=y
-+CONFIG_X86_MCE_INTEL=y
-+CONFIG_X86_MCE_AMD=y
-+CONFIG_X86_MCE_THRESHOLD=y
-+# CONFIG_X86_MCE_INJECT is not set
-+CONFIG_X86_THERMAL_VECTOR=y
-+# CONFIG_I8K is not set
-+# CONFIG_MICROCODE is not set
-+CONFIG_X86_MSR=y
-+CONFIG_X86_CPUID=y
-+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-+CONFIG_DIRECT_GBPAGES=y
-+# CONFIG_NUMA is not set
-+CONFIG_ARCH_SPARSEMEM_ENABLE=y
-+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_SPARSEMEM_MANUAL=y
-+CONFIG_SPARSEMEM=y
-+CONFIG_HAVE_MEMORY_PRESENT=y
-+CONFIG_SPARSEMEM_EXTREME=y
-+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-+CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
-+CONFIG_SPARSEMEM_VMEMMAP=y
-+CONFIG_HAVE_MEMBLOCK=y
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-grsec-common.patch?r1=1.4&r2=1.4.4.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-grsec_full.patch?r1=1.85.2.4&r2=1.85.2.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-unionfs.patch?r1=1.14&r2=1.14.2.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-2.3.patch?r1=1.83.2.2&r2=1.83.2.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.987.2.8&r2=1.987.2.9&f=u



More information about the pld-cvs-commit mailing list