diff options
| author | Avi Kivity <avi@qumranet.com> | 2007-07-18 07:55:44 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2007-07-18 07:55:44 +0300 |
| commit | 45dff1900d4c3eb81e0a1ea8611c172e4a736088 (patch) | |
| tree | cc74c9ceef825dc254f4d0bd6205f716bbcc4407 /drivers/serial/cpm_uart/cpm_uart_core.c | |
| parent | 0dfb860def58bfb2daa000af490ed1986373fea5 (diff) | |
| parent | cb32da0416b823b7f4b65e7e85d6cba16ca4d1e1 (diff) | |
KVM: Merge remote branch 'origin/master'kvm-30
Conflicts:
drivers/kvm/kvm.h
drivers/kvm/kvm_main.c
drivers/kvm/mmu.c
drivers/kvm/svm.c
drivers/kvm/vmx.c
drivers/kvm/x86_emulate.c
Diffstat (limited to 'drivers/serial/cpm_uart/cpm_uart_core.c')
| -rw-r--r-- | drivers/serial/cpm_uart/cpm_uart_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c index b63ff8dd7304..cefde58dbad2 100644 --- a/drivers/serial/cpm_uart/cpm_uart_core.c +++ b/drivers/serial/cpm_uart/cpm_uart_core.c @@ -678,7 +678,7 @@ static int cpm_uart_tx_pump(struct uart_port *port) } bdp->cbd_datlen = count; bdp->cbd_sc |= BD_SC_READY; - __asm__("eieio"); + eieio(); /* Get next BD. */ if (bdp->cbd_sc & BD_SC_WRAP) bdp = pinfo->tx_bd_base; |