diff options
-rw-r--r-- | arch/frv/Kconfig | 9 | ||||
-rw-r--r-- | arch/frv/kernel/vmlinux.lds.S | 2 |
2 files changed, 10 insertions, 1 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 |
diff --git a/arch/frv/kernel/vmlinux.lds.S b/arch/frv/kernel/vmlinux.lds.S index f42b328b1dd0..ef7527b8b0c7 100644 --- a/arch/frv/kernel/vmlinux.lds.S +++ b/arch/frv/kernel/vmlinux.lds.S | |||
@@ -13,7 +13,7 @@ ENTRY(_start) | |||
13 | 13 | ||
14 | jiffies = jiffies_64 + 4; | 14 | jiffies = jiffies_64 + 4; |
15 | 15 | ||
16 | __page_offset = 0xc0000000; /* start of area covered by struct pages */ | 16 | __page_offset = CONFIG_PAGE_OFFSET; /* start of area covered by struct pages */ |
17 | __kernel_image_start = __page_offset; /* address at which kernel image resides */ | 17 | __kernel_image_start = __page_offset; /* address at which kernel image resides */ |
18 | 18 | ||
19 | SECTIONS | 19 | SECTIONS |