diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 17:03:46 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 17:03:46 +1100 |
| commit | 4824579dcd8be7c8580237785ce6f7b31db054ea (patch) | |
| tree | 174a084a5068489ab7030227c231fe6f7d0e3124 /arch/openrisc/kernel/head.S | |
| parent | a9be5a59553a6b5d424d8ed37f058edfcc09a7d9 (diff) | |
| parent | 1842d91b7b4c6be23064b6601127293173aa750c (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/openrisc/kernel/head.S')
| -rw-r--r-- | arch/openrisc/kernel/head.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/openrisc/kernel/head.S b/arch/openrisc/kernel/head.S index e8a17847bc72..08b40131a7cf 100644 --- a/arch/openrisc/kernel/head.S +++ b/arch/openrisc/kernel/head.S @@ -325,7 +325,7 @@ _dispatch_do_ipage_fault: .org 0x500 EXCEPTION_HANDLE(_timer_handler) -/* ---[ 0x600: Aligment exception ]-------------------------------------- */ +/* ---[ 0x600: Alignment exception ]-------------------------------------- */ .org 0x600 EXCEPTION_HANDLE(_alignment_handler) @@ -640,8 +640,8 @@ _flush_tlb: /* ========================================[ cache ]=== */ - /* aligment here so we don't change memory offsets with - * memory controler defined + /* alignment here so we don't change memory offsets with + * memory controller defined */ .align 0x2000 |