linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Masahiro Yamada <masahiroy@kernel.org>
To: Arnd Bergmann <arnd@arndb.de>, linux-kernel@vger.kernel.org
Cc: linux-kbuild@vger.kernel.org, linux-arch@vger.kernel.org,
	Masahiro Yamada <masahiroy@kernel.org>
Subject: [PATCH 8/8] virtio_ring.h: do not include <stdint.h> from exported header
Date: Mon,  4 Apr 2022 15:19:48 +0900	[thread overview]
Message-ID: <20220404061948.2111820-9-masahiroy@kernel.org> (raw)
In-Reply-To: <20220404061948.2111820-1-masahiroy@kernel.org>

Arnd mentioned a limitation when including <stdint.h> from UAPI
headers. [1]

Besides, I'd like exported headers to be as compliant with the
traditional C as possible.

In fact, the UAPI headers are compile-tested with -std=c90 (see
usr/include/Makefile) even though the kernel itself is now built
with -std=gnu11.

Currently, include/uapi/linux/virtio_ring.h includes <stdint.h>
presumably because it uses uintptr_t.

Replace it with __kernel_uintptr_t, and stop including <stdint.h>.

[1]: https://lore.kernel.org/all/CAK8P3a0bz8XYJOsmND2=CT_oTDmGMJGaRo9+QMroEhpekSMEaQ@mail.gmail.com/

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 include/uapi/linux/virtio_ring.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/include/uapi/linux/virtio_ring.h b/include/uapi/linux/virtio_ring.h
index 476d3e5c0fe7..6329e4ff35f4 100644
--- a/include/uapi/linux/virtio_ring.h
+++ b/include/uapi/linux/virtio_ring.h
@@ -31,9 +31,7 @@
  * SUCH DAMAGE.
  *
  * Copyright Rusty Russell IBM Corporation 2007. */
-#ifndef __KERNEL__
-#include <stdint.h>
-#endif
+
 #include <linux/types.h>
 #include <linux/virtio_types.h>
 
@@ -196,7 +194,7 @@ static inline void vring_init(struct vring *vr, unsigned int num, void *p,
 	vr->num = num;
 	vr->desc = p;
 	vr->avail = (struct vring_avail *)((char *)p + num * sizeof(struct vring_desc));
-	vr->used = (void *)(((uintptr_t)&vr->avail->ring[num] + sizeof(__virtio16)
+	vr->used = (void *)(((__kernel_uintptr_t)&vr->avail->ring[num] + sizeof(__virtio16)
 		+ align-1) & ~(align - 1));
 }
 
-- 
2.32.0


  parent reply	other threads:[~2022-04-04  6:21 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-04  6:19 [PATCH 0/8] UAPI: make more exported headers self-contained, and put them into test coverage Masahiro Yamada
2022-04-04  6:19 ` [PATCH 1/8] agpgart.h: do not include <stdlib.h> from exported header Masahiro Yamada
2022-04-04  7:40   ` Christoph Hellwig
2022-04-04 17:27   ` Nick Desaulniers
2022-04-04  6:19 ` [PATCH 2/8] kbuild: prevent exported headers from including <stdlib.h>, <stdbool.h> Masahiro Yamada
2022-04-04  7:41   ` Christoph Hellwig
2022-04-04  8:01     ` Arnd Bergmann
2022-04-04  8:03     ` Masahiro Yamada
2022-04-04 17:34     ` Nick Desaulniers
2022-04-05  1:12       ` Masahiro Yamada
2022-04-04  6:19 ` [PATCH 3/8] riscv: add linux/bpf_perf_event.h to UAPI compile-test coverage Masahiro Yamada
2022-04-04  7:41   ` Christoph Hellwig
2022-04-04  6:19 ` [PATCH 4/8] mips: add asm/stat.h " Masahiro Yamada
2022-04-04  7:42   ` Christoph Hellwig
2022-04-04  6:19 ` [PATCH 5/8] powerpc: " Masahiro Yamada
2022-04-04  7:42   ` Christoph Hellwig
2022-04-04  6:19 ` [PATCH 6/8] sparc: " Masahiro Yamada
2022-04-04  7:43   ` Christoph Hellwig
2022-04-04  6:19 ` [PATCH 7/8] posix_types.h: add __kernel_uintptr_t to UAPI posix_types.h Masahiro Yamada
2022-04-04 11:30   ` kernel test robot
2022-04-04 11:51     ` Masahiro Yamada
2022-04-04 12:02       ` Masahiro Yamada
2022-04-04 11:51   ` kernel test robot
2022-04-04 13:04   ` kernel test robot
2022-04-04  6:19 ` Masahiro Yamada [this message]
2022-04-04  7:44   ` [PATCH 8/8] virtio_ring.h: do not include <stdint.h> from exported header Christoph Hellwig
2022-04-04  7:58     ` Masahiro Yamada
2022-04-04  8:04     ` Arnd Bergmann
2022-04-05  5:35       ` Christoph Hellwig
2022-04-05  6:29         ` Arnd Bergmann
2022-04-05  7:01           ` Christoph Hellwig
2022-04-05 11:55             ` Michael S. Tsirkin
2022-04-05 11:57           ` Michael S. Tsirkin
2022-04-05 11:59     ` Michael S. Tsirkin
2022-04-05 11:57   ` Michael S. Tsirkin
2022-04-04  7:34 ` [PATCH 0/8] UAPI: make more exported headers self-contained, and put them into test coverage Arnd Bergmann
2022-05-13  8:43   ` Masahiro Yamada
2022-05-13  9:01     ` Arnd Bergmann
2022-05-13  9:13       ` Masahiro Yamada

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220404061948.2111820-9-masahiroy@kernel.org \
    --to=masahiroy@kernel.org \
    --cc=arnd@arndb.de \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).