mn10300: READ_ONCE() now implies smp_read_barrier_depends()

[sfrench/cifs-2.6.git] / arch / mn10300 / kernel / mn10300-serial.c

diff --git a/arch/mn10300/kernel/mn10300-serial.c b/arch/mn10300/kernel/mn10300-serial.c
index d7ef1232a82a56da071ad58d0c9dc0b434430944..4994b570dfd96cf2a06f93a9ea71aa7184191e2d 100644 (file)
--- a/arch/mn10300/kernel/mn10300-serial.c
+++ b/arch/mn10300/kernel/mn10300-serial.c
@@ -550,7 +550,7 @@ try_again:
                return;
        }
 
-       smp_read_barrier_depends();
+       /* READ_ONCE() enforces dependency, but dangerous through integer!!! */
        ch = port->rx_buffer[ix++];
        st = port->rx_buffer[ix++];
        smp_mb();
@@ -1728,7 +1728,10 @@ static int mn10300_serial_poll_get_char(struct uart_port *_port)
                        if (CIRC_CNT(port->rx_inp, ix, MNSC_BUFFER_SIZE) == 0)
                                return NO_POLL_CHAR;
 
-                       smp_read_barrier_depends();
+                       /*
+                        * READ_ONCE() enforces dependency, but dangerous
+                        * through integer!!!
+                        */
                        ch = port->rx_buffer[ix++];
                        st = port->rx_buffer[ix++];
                        smp_mb();