diff --git a/[refs] b/[refs] index fd6dde8892eb..74d69bd21db9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d145a501778042d0411c843ed5b468b41f8a171 +refs/heads/master: 1aedfa8f25c13a2f5428cb1b0f806e04121cbef5 diff --git a/trunk/drivers/staging/fwserial/fwserial.h b/trunk/drivers/staging/fwserial/fwserial.h index 33a3a53a47ff..514f57173259 100644 --- a/trunk/drivers/staging/fwserial/fwserial.h +++ b/trunk/drivers/staging/fwserial/fwserial.h @@ -280,7 +280,7 @@ struct fwtty_port { loopback:1; unsigned long flags; - struct fwtty_peer *peer; + struct fwtty_peer __rcu *peer; struct async_icount icount; struct stats stats;