Merge branch 'rhashtable-bit-locking-m68k'
authorDavid S. Miller <davem@davemloft.net>
Sat, 13 Apr 2019 00:34:46 +0000 (17:34 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 13 Apr 2019 00:34:46 +0000 (17:34 -0700)
commit5fa7d3f9d3184be18b3a5af2530b4d40a5643a1f
tree62c8abb3a46c5a79950205f59c42c3a996df43eb
parentc252aa3e8ed3ac54060b1838f6a47f29799a133d
parentca0b709d1a07b1fe1fb356d8d58f220287f85672
Merge branch 'rhashtable-bit-locking-m68k'

NeilBrown says:

====================
Fix rhashtable bit-locking for m68k

As reported by Guenter Roeck, the new rhashtable bit-locking
doesn't work on m68k as it only requires 2-byte alignment, so BIT(1)
is addresses is not unused.

We current use BIT(0) to identify a NULLS marker, but that is only
needed in ->next pointers.  The bucket head does not need a NULLS
marker, so the lsb there can be used for locking.

the first 4 patches make some small improvements and re-arrange some
code.  The final patch converts to using only BIT(0) for these two
different special purposes.

I had previously suggested dropping the series until I fix it.  Given
that this was fairly easy, I retract that I think it best simply to
add these patches to fix the code.
====================

Tested-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: David S. Miller <davem@davemloft.net>