Skip to content

Commit

Permalink
docs/core-api: Remove possibly confusing sub-headings from Bit Operat…
Browse files Browse the repository at this point in the history
…ions

The recent commit 81d2c6f ("kasan: support instrumented bitops
combined with generic bitops"), split the KASAN instrumented bitops
into separate headers for atomic, non-atomic and locking operations.

This was done to allow arches to include just the instrumented bitops
they need, while also using some of the generic bitops in
asm-generic/bitops (which are automatically instrumented). The generic
bitops are already split into atomic, non-atomic and locking headers.

This split required an update to kernel-api.rst because it included
include/asm-generic/bitops-instrumented.h, which no longer exists. So
now kernel-api.rst includes all three instrumented headers to get the
definitions for all the bitops.

When adding the three headers it seemed sensible to add sub-headings
for each, ie. "Atomic", "Non-atomic" and "Locking".

The confusion is that test_bit() is (and always has been) in
non-atomic.h, but is documented elsewhere (atomic_bitops.txt) as being
atomic. So having it appear under the "Non-atomic" heading is possibly
confusing.

Probably test_bit() should move from bitops/non-atomic.h to atomic.h,
but that has flow on effects. For now just remove the newly added
sub-headings in the documentation, so we at least aren't adding to the
confusion about whether test_bit() is atomic or not.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
  • Loading branch information
Michael Ellerman committed Dec 4, 2019
1 parent 5bece3d commit 4f4afc2
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions Documentation/core-api/kernel-api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -57,21 +57,12 @@ The Linux kernel provides more basic utility functions.
Bit Operations
--------------

Atomic Operations
~~~~~~~~~~~~~~~~~

.. kernel-doc:: include/asm-generic/bitops/instrumented-atomic.h
:internal:

Non-atomic Operations
~~~~~~~~~~~~~~~~~~~~~

.. kernel-doc:: include/asm-generic/bitops/instrumented-non-atomic.h
:internal:

Locking Operations
~~~~~~~~~~~~~~~~~~

.. kernel-doc:: include/asm-generic/bitops/instrumented-lock.h
:internal:

Expand Down

0 comments on commit 4f4afc2

Please sign in to comment.