diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-25 13:51:46 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-25 13:51:46 +0100 |
| commit | 0b271ef4521756010675b1611bef20fd3096790d (patch) | |
| tree | 2c9d22a2c74122a9904e533df27f41d63ffef394 /arch/mn10300/kernel/gdb-io-serial.c | |
| parent | b19b3c74c7bbec45a848631b8f970ac110665a01 (diff) | |
| parent | 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff) | |
Merge commit 'v2.6.28' into core/core
Diffstat (limited to 'arch/mn10300/kernel/gdb-io-serial.c')
| -rw-r--r-- | arch/mn10300/kernel/gdb-io-serial.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mn10300/kernel/gdb-io-serial.c b/arch/mn10300/kernel/gdb-io-serial.c index 9a6d4e8ebe7..11584c51acd 100644 --- a/arch/mn10300/kernel/gdb-io-serial.c +++ b/arch/mn10300/kernel/gdb-io-serial.c @@ -99,6 +99,7 @@ int gdbstub_io_rx_char(unsigned char *_ch, int nonblock) try_again: /* pull chars out of the buffer */ ix = gdbstub_rx_outp; + barrier(); if (ix == gdbstub_rx_inp) { if (nonblock) return -EAGAIN; @@ -110,6 +111,7 @@ int gdbstub_io_rx_char(unsigned char *_ch, int nonblock) ch = gdbstub_rx_buffer[ix++]; st = gdbstub_rx_buffer[ix++]; + barrier(); gdbstub_rx_outp = ix & 0x00000fff; if (st & UART_LSR_BI) { |