Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

openrisc: rename or32 code & comments to or1k

From Documentation/openrisc/todo.rst, rename "or32" in the
source code to "or1k" since this is the name that has been
settled on.

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
Cc: Stafford Horne <shorne@gmail.com>
Cc: openrisc@lists.librecores.org
Signed-off-by: Stafford Horne <shorne@gmail.com>

authored by

Randy Dunlap and committed by
Stafford Horne
11648cbb 946e1052

+13 -13
+3 -3
arch/openrisc/include/asm/pgtable.h
··· 12 12 * et al. 13 13 */ 14 14 15 - /* or32 pgtable.h - macros and functions to manipulate page tables 15 + /* or1k pgtable.h - macros and functions to manipulate page tables 16 16 * 17 17 * Based on: 18 18 * include/asm-cris/pgtable.h ··· 29 29 30 30 /* 31 31 * The Linux memory management assumes a three-level page table setup. On 32 - * or32, we use that, but "fold" the mid level into the top-level page 32 + * or1k, we use that, but "fold" the mid level into the top-level page 33 33 * table. Since the MMU TLB is software loaded through an interrupt, it 34 34 * supports any page table structure, so we could have used a three-level 35 35 * setup, but for the amounts of memory we normally use, a two-level is 36 36 * probably more efficient. 37 37 * 38 38 * This file contains the functions and defines necessary to modify and use 39 - * the or32 page table tree. 39 + * the or1k page table tree. 40 40 */ 41 41 42 42 extern void paging_init(void);
+1 -1
arch/openrisc/include/asm/thread_info.h
··· 25 25 26 26 /* THREAD_SIZE is the size of the task_struct/kernel_stack combo. 27 27 * normally, the stack is found by doing something like p + THREAD_SIZE 28 - * in or32, a page is 8192 bytes, which seems like a sane size 28 + * in or1k, a page is 8192 bytes, which seems like a sane size 29 29 */ 30 30 31 31 #define THREAD_SIZE_ORDER 0
+2 -2
arch/openrisc/kernel/entry.S
··· 326 326 1: l.ori r6,r0,0x0 // !write access 327 327 2: 328 328 329 - /* call fault.c handler in or32/mm/fault.c */ 329 + /* call fault.c handler in openrisc/mm/fault.c */ 330 330 l.jal do_page_fault 331 331 l.nop 332 332 l.j _ret_from_exception ··· 348 348 /* r4 set be EXCEPTION_HANDLE */ // effective address of fault 349 349 l.ori r6,r0,0x0 // !write access 350 350 351 - /* call fault.c handler in or32/mm/fault.c */ 351 + /* call fault.c handler in openrisc/mm/fault.c */ 352 352 l.jal do_page_fault 353 353 l.nop 354 354 l.j _ret_from_exception
+3 -3
arch/openrisc/kernel/head.S
··· 599 599 l.jal _flush_tlb 600 600 l.nop 601 601 602 - /* The MMU needs to be enabled before or32_early_setup is called */ 602 + /* The MMU needs to be enabled before or1k_early_setup is called */ 603 603 604 604 enable_mmu: 605 605 /* ··· 641 641 /* magic number mismatch, set fdt pointer to null */ 642 642 l.or r25,r0,r0 643 643 _fdt_found: 644 - /* pass fdt pointer to or32_early_setup in r3 */ 644 + /* pass fdt pointer to or1k_early_setup in r3 */ 645 645 l.or r3,r0,r25 646 - LOAD_SYMBOL_2_GPR(r24, or32_early_setup) 646 + LOAD_SYMBOL_2_GPR(r24, or1k_early_setup) 647 647 l.jalr r24 648 648 l.nop 649 649
+2 -2
arch/openrisc/kernel/setup.c
··· 209 209 } 210 210 211 211 /** 212 - * or32_early_setup 212 + * or1k_early_setup 213 213 * 214 214 * Handles the pointer to the device tree that this kernel is to use 215 215 * for establishing the available platform devices. ··· 217 217 * Falls back on built-in device tree in case null pointer is passed. 218 218 */ 219 219 220 - void __init or32_early_setup(void *fdt) 220 + void __init or1k_early_setup(void *fdt) 221 221 { 222 222 if (fdt) 223 223 pr_info("FDT at %p\n", fdt);
+1 -1
arch/openrisc/lib/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0-only 2 2 # 3 - # Makefile for or32 specific library files.. 3 + # Makefile for or1k specific library files.. 4 4 # 5 5 6 6 obj-y := delay.o string.o memset.o memcpy.o
+1 -1
arch/openrisc/mm/fault.c
··· 28 28 unsigned long pte_errors; /* updated by do_page_fault() */ 29 29 30 30 /* __PHX__ :: - check the vmalloc_fault in do_page_fault() 31 - * - also look into include/asm-or32/mmu_context.h 31 + * - also look into include/asm/mmu_context.h 32 32 */ 33 33 volatile pgd_t *current_pgd[NR_CPUS]; 34 34