diff --git a/[refs] b/[refs] index c94785fec47d..19304bab7acf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51f3547d619956e9b428bfff17004d8f4d259a02 +refs/heads/master: c170f86e31410cc38971c1dedd8b25885e6e43b6 diff --git a/trunk/arch/sh/include/asm/auxvec.h b/trunk/arch/sh/include/asm/auxvec.h index a6b9d4f4859e..483effd65e00 100644 --- a/trunk/arch/sh/include/asm/auxvec.h +++ b/trunk/arch/sh/include/asm/auxvec.h @@ -12,7 +12,7 @@ */ #define AT_FPUCW 18 /* Used FPU control word. */ -#ifdef CONFIG_VSYSCALL +#if defined(CONFIG_VSYSCALL) || !defined(__KERNEL__) /* * Only define this in the vsyscall case, the entry point to * the vsyscall page gets placed here. The kernel will attempt