diff options
| author | Remy Noel <mocramis@gmail.com> | 2018-01-14 16:08:46 +0100 |
|---|---|---|
| committer | Remy Noel <mocramis@gmail.com> | 2018-01-14 16:08:46 +0100 |
| commit | e0589696a0f392c2e18849b1fd8cb6070a601383 (patch) | |
| tree | 2609d0c94e3b6ec22147de79f9edb5365510f662 /arch/x86/machine | |
| parent | bf5c783d4cad55ba41210ba71b3c8e28ce63cfa8 (diff) | |
| parent | 4da32fe89380347ac6845a3c0e33346f6ff019c6 (diff) | |
Merge branch 'master' into perfmon
Diffstat (limited to 'arch/x86/machine')
| -rw-r--r-- | arch/x86/machine/cpu.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/machine/cpu.h b/arch/x86/machine/cpu.h index 5299013..7675822 100644 --- a/arch/x86/machine/cpu.h +++ b/arch/x86/machine/cpu.h @@ -441,7 +441,7 @@ extern void *cpu_local_area; MACRO_BEGIN \ typeof(var) *___ptr = &(var); \ \ - asm volatile("add %%fs:%1, %0" \ + asm("add %%fs:%1, %0" \ : "+r" (___ptr) \ : "m" (cpu_local_area)); \ \ @@ -453,14 +453,14 @@ MACRO_END /* Interrupt-safe percpu accessors for basic types */ #define cpu_local_assign(var, val) \ - asm volatile("mov %0, %%fs:%1" \ + asm("mov %0, %%fs:%1" \ : : "r" (val), "m" (var)); #define cpu_local_read(var) \ MACRO_BEGIN \ typeof(var) ___val; \ \ - asm volatile("mov %%fs:%1, %0" \ + asm("mov %%fs:%1, %0" \ : "=r" (___val) \ : "m" (var)); \ \ |