diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-05-22 14:25:34 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-05-22 14:25:34 -0400 |
| commit | e4b636366c00738b9609cda307014d71b1225b7f (patch) | |
| tree | 760b67b3624eda62e943e48ce93635c30a5b47bf /arch/x86/include/asm/percpu.h | |
| parent | b9ed7252d219c1c663944bf03846eabb515dbe75 (diff) | |
| parent | 279e677faa775ad16e75c32e1bf4a37f8158bc61 (diff) | |
Merge branch 'master' into for-2.6.31
Conflicts:
drivers/block/hd.c
drivers/block/mg_disk.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'arch/x86/include/asm/percpu.h')
| -rw-r--r-- | arch/x86/include/asm/percpu.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h index aee103b26d01..02ecb30982a3 100644 --- a/arch/x86/include/asm/percpu.h +++ b/arch/x86/include/asm/percpu.h | |||
| @@ -82,22 +82,22 @@ do { \ | |||
| 82 | case 1: \ | 82 | case 1: \ |
| 83 | asm(op "b %1,"__percpu_arg(0) \ | 83 | asm(op "b %1,"__percpu_arg(0) \ |
| 84 | : "+m" (var) \ | 84 | : "+m" (var) \ |
| 85 | : "ri" ((T__)val)); \ | 85 | : "qi" ((T__)(val))); \ |
| 86 | break; \ | 86 | break; \ |
| 87 | case 2: \ | 87 | case 2: \ |
| 88 | asm(op "w %1,"__percpu_arg(0) \ | 88 | asm(op "w %1,"__percpu_arg(0) \ |
| 89 | : "+m" (var) \ | 89 | : "+m" (var) \ |
| 90 | : "ri" ((T__)val)); \ | 90 | : "ri" ((T__)(val))); \ |
| 91 | break; \ | 91 | break; \ |
| 92 | case 4: \ | 92 | case 4: \ |
| 93 | asm(op "l %1,"__percpu_arg(0) \ | 93 | asm(op "l %1,"__percpu_arg(0) \ |
| 94 | : "+m" (var) \ | 94 | : "+m" (var) \ |
| 95 | : "ri" ((T__)val)); \ | 95 | : "ri" ((T__)(val))); \ |
| 96 | break; \ | 96 | break; \ |
| 97 | case 8: \ | 97 | case 8: \ |
| 98 | asm(op "q %1,"__percpu_arg(0) \ | 98 | asm(op "q %1,"__percpu_arg(0) \ |
| 99 | : "+m" (var) \ | 99 | : "+m" (var) \ |
| 100 | : "re" ((T__)val)); \ | 100 | : "re" ((T__)(val))); \ |
| 101 | break; \ | 101 | break; \ |
| 102 | default: __bad_percpu_size(); \ | 102 | default: __bad_percpu_size(); \ |
| 103 | } \ | 103 | } \ |
| @@ -109,7 +109,7 @@ do { \ | |||
| 109 | switch (sizeof(var)) { \ | 109 | switch (sizeof(var)) { \ |
| 110 | case 1: \ | 110 | case 1: \ |
| 111 | asm(op "b "__percpu_arg(1)",%0" \ | 111 | asm(op "b "__percpu_arg(1)",%0" \ |
| 112 | : "=r" (ret__) \ | 112 | : "=q" (ret__) \ |
| 113 | : "m" (var)); \ | 113 | : "m" (var)); \ |
| 114 | break; \ | 114 | break; \ |
| 115 | case 2: \ | 115 | case 2: \ |