mirror of
https://github.com/torvalds/linux
synced 2024-09-20 11:07:02 +00:00
powerpc/mm: use core_kernel_text() helper
Use core_kernel_text() helper to simplify code, also drop etext, _stext, _sinittext, _einittext declaration which already declared in section.h. Link: https://lkml.kernel.org/r/20210930071143.63410-10-wangkefeng.wang@huawei.com Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> Reviewed-by: Sergey Senozhatsky <senozhatsky@chromium.org> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Christophe Leroy <christophe.leroy@csgroup.eu> Cc: Alexander Potapenko <glider@google.com> Cc: Alexei Starovoitov <ast@kernel.org> Cc: Andrey Konovalov <andreyknvl@gmail.com> Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Borislav Petkov <bp@alien8.de> Cc: "David S. Miller" <davem@davemloft.net> Cc: Dmitry Vyukov <dvyukov@google.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Matt Turner <mattst88@gmail.com> Cc: Michal Simek <monstr@monstr.eu> Cc: Petr Mladek <pmladek@suse.com> Cc: Richard Henderson <rth@twiddle.net> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
808b64565b
commit
843a1ffaf6
|
@ -33,8 +33,6 @@
|
||||||
|
|
||||||
#include <mm/mmu_decl.h>
|
#include <mm/mmu_decl.h>
|
||||||
|
|
||||||
extern char etext[], _stext[], _sinittext[], _einittext[];
|
|
||||||
|
|
||||||
static u8 early_fixmap_pagetable[FIXMAP_PTE_SIZE] __page_aligned_data;
|
static u8 early_fixmap_pagetable[FIXMAP_PTE_SIZE] __page_aligned_data;
|
||||||
|
|
||||||
notrace void __init early_ioremap_init(void)
|
notrace void __init early_ioremap_init(void)
|
||||||
|
@ -104,14 +102,13 @@ static void __init __mapin_ram_chunk(unsigned long offset, unsigned long top)
|
||||||
{
|
{
|
||||||
unsigned long v, s;
|
unsigned long v, s;
|
||||||
phys_addr_t p;
|
phys_addr_t p;
|
||||||
int ktext;
|
bool ktext;
|
||||||
|
|
||||||
s = offset;
|
s = offset;
|
||||||
v = PAGE_OFFSET + s;
|
v = PAGE_OFFSET + s;
|
||||||
p = memstart_addr + s;
|
p = memstart_addr + s;
|
||||||
for (; s < top; s += PAGE_SIZE) {
|
for (; s < top; s += PAGE_SIZE) {
|
||||||
ktext = ((char *)v >= _stext && (char *)v < etext) ||
|
ktext = core_kernel_text(v);
|
||||||
((char *)v >= _sinittext && (char *)v < _einittext);
|
|
||||||
map_kernel_page(v, p, ktext ? PAGE_KERNEL_TEXT : PAGE_KERNEL);
|
map_kernel_page(v, p, ktext ? PAGE_KERNEL_TEXT : PAGE_KERNEL);
|
||||||
v += PAGE_SIZE;
|
v += PAGE_SIZE;
|
||||||
p += PAGE_SIZE;
|
p += PAGE_SIZE;
|
||||||
|
|
Loading…
Reference in a new issue