diff options
| author |   Linus Walleij <linus.walleij@linaro.org> | 2013-10-08 13:27:11 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-10-08 13:27:11 +0200 |
| commit | bfabb59433fc18ff78d2818e10e212d0f85d56ae (patch) | |
| tree | dd7cbead179c09c62627a84c16c802d99095ba6e /arch/s390/include/asm/mutex.h | |
| parent | pinctrl: sirf: add USB1/UART1 pinmux usb/uart share (diff) | |
| parent | Linux 3.12-rc4 (diff) | |
| download | linux-dev-bfabb59433fc18ff78d2818e10e212d0f85d56ae.tar.xz linux-dev-bfabb59433fc18ff78d2818e10e212d0f85d56ae.zip | |
Merge tag 'v3.12-rc4' into devel
Linux 3.12-rc4
Diffstat (limited to 'arch/s390/include/asm/mutex.h')
| -rw-r--r-- | arch/s390/include/asm/mutex.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/s390/include/asm/mutex.h b/arch/s390/include/asm/mutex.h index 688271f5f2e4..458c1f7fbc18 100644 --- a/arch/s390/include/asm/mutex.h +++ b/arch/s390/include/asm/mutex.h @@ -7,5 +7,3 @@ */ #include <asm-generic/mutex-dec.h> - -#define arch_mutex_cpu_relax() barrier() |