diff options
| author | Borislav Petkov <bp@suse.de> | 2022-03-21 10:34:57 +0100 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2022-03-21 10:34:57 +0100 |
| commit | 1422df58e5eb83dca131dc64e0f307a1f9e56078 (patch) | |
| tree | f54bb7952a406cd783cbdbfe1b5ac4f80de02d68 /arch/mips/kernel/syscall.c | |
| parent | e1bca853dddcb57cbf084acbf35e3654cef6fc75 (diff) | |
| parent | 2151c84ece920dc55942495004a823cbecb921e5 (diff) | |
| download | linux-1422df58e5eb83dca131dc64e0f307a1f9e56078.tar.gz linux-1422df58e5eb83dca131dc64e0f307a1f9e56078.tar.bz2 linux-1422df58e5eb83dca131dc64e0f307a1f9e56078.zip | |
Merge branch 'edac-amd64' into edac-updates-for-v5.18
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'arch/mips/kernel/syscall.c')
| -rw-r--r-- | arch/mips/kernel/syscall.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c index 5512cd586e6e..ae93a607ddf7 100644 --- a/arch/mips/kernel/syscall.c +++ b/arch/mips/kernel/syscall.c @@ -122,8 +122,8 @@ static inline int mips_atomic_set(unsigned long addr, unsigned long new) " j 3b \n" " .previous \n" " .section __ex_table,\"a\" \n" - " "STR(PTR)" 1b, 4b \n" - " "STR(PTR)" 2b, 4b \n" + " "STR(PTR_WD)" 1b, 4b \n" + " "STR(PTR_WD)" 2b, 4b \n" " .previous \n" " .set pop \n" : [old] "=&r" (old), @@ -152,8 +152,8 @@ static inline int mips_atomic_set(unsigned long addr, unsigned long new) " j 3b \n" " .previous \n" " .section __ex_table,\"a\" \n" - " "STR(PTR)" 1b, 5b \n" - " "STR(PTR)" 2b, 5b \n" + " "STR(PTR_WD)" 1b, 5b \n" + " "STR(PTR_WD)" 2b, 5b \n" " .previous \n" " .set pop \n" : [old] "=&r" (old), |