Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: Kill off I/O cruft for R7780RP. sh: Revert lazy dcache writeback changes. sh: Enable SM501 support for RTS7751R2D. sh: Use L1_CACHE_BYTES for .data.cacheline_aligned. sysctl: Support vdso_enabled sysctl on SH. sh: Fix kernel thread stack corruption with preempt. doc: Add SH to vdso and earlyprintk in kernel-parameters.txt sh: Fix sigmask trampling in signal delivery. sh: Clear UBC when not in use.
This commit is contained in:
+2
-1
@@ -846,7 +846,8 @@ static ctl_table vm_table[] = {
|
||||
.extra2 = &one_hundred,
|
||||
},
|
||||
#endif
|
||||
#ifdef CONFIG_X86_32
|
||||
#if defined(CONFIG_X86_32) || \
|
||||
(defined(CONFIG_SUPERH) && defined(CONFIG_VSYSCALL))
|
||||
{
|
||||
.ctl_name = VM_VDSO_ENABLED,
|
||||
.procname = "vdso_enabled",
|
||||
|
||||
Reference in New Issue
Block a user