diff options
author | Steve French <sfrench@us.ibm.com> | 2008-02-06 11:04:00 -0500 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2008-02-06 11:04:00 -0500 |
commit | f315ccb3e679f271583f2a4f463ad9b65665b751 (patch) | |
tree | 44eb52102587d7b0bb592464cef6ec04bcac8b90 /arch/frv/Kconfig | |
parent | ead03e30b050d6dda769e7e9b071c5fa720bf8d2 (diff) | |
parent | 551e4fb2465b87de9d4aa1669b27d624435443bb (diff) |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/frv/Kconfig')
-rw-r--r-- | arch/frv/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig index bf0468cbe713..96f7d70f4473 100644 --- a/arch/frv/Kconfig +++ b/arch/frv/Kconfig | |||
@@ -138,6 +138,15 @@ config UCPAGE_OFFSET_C0000000 | |||
138 | 138 | ||
139 | endchoice | 139 | endchoice |
140 | 140 | ||
141 | config PAGE_OFFSET | ||
142 | hex | ||
143 | default 0x20000000 if UCPAGE_OFFSET_20000000 | ||
144 | default 0x40000000 if UCPAGE_OFFSET_40000000 | ||
145 | default 0x60000000 if UCPAGE_OFFSET_60000000 | ||
146 | default 0x80000000 if UCPAGE_OFFSET_80000000 | ||
147 | default 0xA0000000 if UCPAGE_OFFSET_A0000000 | ||
148 | default 0xC0000000 | ||
149 | |||
141 | config PROTECT_KERNEL | 150 | config PROTECT_KERNEL |
142 | bool "Protect core kernel against userspace" | 151 | bool "Protect core kernel against userspace" |
143 | depends on !MMU | 152 | depends on !MMU |