diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-04-13 18:58:33 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-04-13 18:58:33 +1000 |
| commit | c03156f8d8b7420c9c53d5d37b5c1696a931cb6e (patch) | |
| tree | ebfc85df4d9673aa974668b51aa2638a41f116da /arch/ia64/kernel/pal.S | |
| parent | f195cda9b95d03d27906f98a61456d47ced1c35b (diff) | |
| parent | 3ad29d0ccd4c42afa271bc8529fb357adff944ec (diff) | |
| download | linux-next-c03156f8d8b7420c9c53d5d37b5c1696a931cb6e.tar.gz | |
Merge branch 'akpm-current/current'
Diffstat (limited to 'arch/ia64/kernel/pal.S')
| -rw-r--r-- | arch/ia64/kernel/pal.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/kernel/pal.S b/arch/ia64/kernel/pal.S index d3e22c018b68..06d01a070aae 100644 --- a/arch/ia64/kernel/pal.S +++ b/arch/ia64/kernel/pal.S @@ -86,7 +86,7 @@ GLOBAL_ENTRY(ia64_pal_call_static) mov ar.pfs = loc1 mov rp = loc0 ;; - srlz.d // seralize restoration of psr.l + srlz.d // serialize restoration of psr.l br.ret.sptk.many b0 END(ia64_pal_call_static) EXPORT_SYMBOL(ia64_pal_call_static) @@ -194,7 +194,7 @@ GLOBAL_ENTRY(ia64_pal_call_phys_static) mov rp = loc0 ;; mov ar.rsc=loc4 // restore RSE configuration - srlz.d // seralize restoration of psr.l + srlz.d // serialize restoration of psr.l br.ret.sptk.many b0 END(ia64_pal_call_phys_static) EXPORT_SYMBOL(ia64_pal_call_phys_static) @@ -252,7 +252,7 @@ GLOBAL_ENTRY(ia64_pal_call_phys_stacked) mov rp = loc0 ;; mov ar.rsc=loc4 // restore RSE configuration - srlz.d // seralize restoration of psr.l + srlz.d // serialize restoration of psr.l br.ret.sptk.many b0 END(ia64_pal_call_phys_stacked) EXPORT_SYMBOL(ia64_pal_call_phys_stacked) |