summaryrefslogtreecommitdiffstats
path: root/arch/xtensa/include
diff options
context:
space:
mode:
authorMax Filippov2015-09-20 13:45:37 +0200
committerMax Filippov2015-11-02 16:02:58 +0100
commitcfedf08b0c09f325fa24d91e8c9433ec481800cf (patch)
treeb1c5c350907cbc7bd45a6ceb05f52930afb7a730 /arch/xtensa/include
parentxtensa: xtfpga: fix integer overflow in TASK_SIZE (diff)
downloadkernel-qcow2-linux-cfedf08b0c09f325fa24d91e8c9433ec481800cf.tar.gz
kernel-qcow2-linux-cfedf08b0c09f325fa24d91e8c9433ec481800cf.tar.xz
kernel-qcow2-linux-cfedf08b0c09f325fa24d91e8c9433ec481800cf.zip
xtensa: nommu: fix USER_RING definition
There's no kernel/user separation in noMMU and PS.RING may not exist. Even if it exists it should not be used because TLB entries are not set up for user ring on user pages. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Diffstat (limited to 'arch/xtensa/include')
-rw-r--r--arch/xtensa/include/asm/pgtable.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/xtensa/include/asm/pgtable.h b/arch/xtensa/include/asm/pgtable.h
index a5e929a10c20..fb02fdc5ecee 100644
--- a/arch/xtensa/include/asm/pgtable.h
+++ b/arch/xtensa/include/asm/pgtable.h
@@ -18,7 +18,11 @@
* We only use two ring levels, user and kernel space.
*/
+#ifdef CONFIG_MMU
#define USER_RING 1 /* user ring level */
+#else
+#define USER_RING 0
+#endif
#define KERNEL_RING 0 /* kernel ring level */
/*