diff options
| author |   Al Viro <viro@zeniv.linux.org.uk> | 2012-11-16 20:48:13 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-16 20:49:06 -0500 |
| commit | 85910c202bb869edd2bb9a6c217a658c83f06f1e (patch) | |
| tree | fcf4bf1ba2ebfcb6dec395a10ed6b33e7d33217e /arch/sparc/kernel/sys_sparc_64.c | |
| parent | sparc32: switch to generic sys_execve() (diff) | |
| parent | sparc64: Make montmul/montsqr/mpmul usable in 32-bit threads. (diff) | |
| download | linux-dev-85910c202bb869edd2bb9a6c217a658c83f06f1e.tar.xz linux-dev-85910c202bb869edd2bb9a6c217a658c83f06f1e.zip | |
Merge commit '517ffce4e1a03aea979fe3a18a3dd1761a24fafb' into arch-sparc
Backmerge from the point in mainline where a trivial conflict had been
introduced (arch/sparc/kernel/sys_sparc_64.c had grown sys_kern_features()
right after where kernel_execve() used to be)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/sparc/kernel/sys_sparc_64.c')
| -rw-r--r-- | arch/sparc/kernel/sys_sparc_64.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c index adfe60ece05f..51b85feb8b97 100644 --- a/arch/sparc/kernel/sys_sparc_64.c +++ b/arch/sparc/kernel/sys_sparc_64.c @@ -729,3 +729,8 @@ SYSCALL_DEFINE5(rt_sigaction, int, sig, const struct sigaction __user *, act, return ret; } + +asmlinkage long sys_kern_features(void) +{ + return KERN_FEATURE_MIXED_MODE_STACK; +} |