diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-07 19:08:33 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-07 19:08:33 +0100 |
| commit | d694c16bc332c7e706f44e3d10bea06228166a6f (patch) | |
| tree | 72d0ab61ce633002a1c4de2406101e28e101afa3 /kernel | |
| parent | [PATCH] CPU hotplug: call check_tsc_sync_source() with irqs off (diff) | |
| parent | sh: Kill off I/O cruft for R7780RP. (diff) | |
| download | linux-d694c16bc332c7e706f44e3d10bea06228166a6f.tar.xz linux-d694c16bc332c7e706f44e3d10bea06228166a6f.zip | |
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.
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sysctl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 34b2301276ce..1b255df4fcd0 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -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", |