]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
kbuild: move some helper headers from scripts/kconfig/ to scripts/include/
authorMasahiro Yamada <masahiroy@kernel.org>
Sat, 20 Jul 2024 07:27:38 +0000 (16:27 +0900)
committerMasahiro Yamada <masahiroy@kernel.org>
Sun, 21 Jul 2024 14:10:43 +0000 (23:10 +0900)
Move array_size.h, hashtable.h, list.h, list_types.h from scripts/kconfig/
to scripts/include/.

These headers will be useful for other host programs.

Remove scripts/mod/list.h.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
18 files changed:
MAINTAINERS
Makefile
scripts/include/array_size.h [moved from scripts/kconfig/array_size.h with 100% similarity]
scripts/include/hashtable.h [moved from scripts/kconfig/hashtable.h with 100% similarity]
scripts/include/list.h [moved from scripts/kconfig/list.h with 100% similarity]
scripts/include/list_types.h [moved from scripts/kconfig/list_types.h with 100% similarity]
scripts/kconfig/expr.h
scripts/kconfig/internal.h
scripts/kconfig/mconf.c
scripts/kconfig/menu.c
scripts/kconfig/mnconf-common.c
scripts/kconfig/mnconf-common.h
scripts/kconfig/nconf.c
scripts/kconfig/preprocess.c
scripts/kconfig/util.c
scripts/mod/list.h [deleted file]
scripts/mod/modpost.c
scripts/mod/modpost.h

index da5352dbd4f3f0878bc48a07ade221c1c69543b2..0fe40cf1929fc8a23e40021c6a5ab69f25c08744 100644 (file)
@@ -11943,6 +11943,7 @@ F:      scripts/Makefile*
 F:     scripts/basic/
 F:     scripts/clang-tools/
 F:     scripts/dummy-tools/
+F:     scripts/include/
 F:     scripts/mk*
 F:     scripts/mod/
 F:     scripts/package/
index c97d6404b891504cbbd70e35c167e7ed13a2a748..cbad2bbe45618aa267cd5bb0cbc3fe4e64f1e31e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -458,8 +458,10 @@ export rust_common_flags := --edition=2021 \
                            -Dclippy::no_mangle_with_rust_abi \
                            -Wclippy::dbg_macro
 
-KBUILD_HOSTCFLAGS   := $(KBUILD_USERHOSTCFLAGS) $(HOST_LFS_CFLAGS) $(HOSTCFLAGS)
-KBUILD_HOSTCXXFLAGS := -Wall -O2 $(HOST_LFS_CFLAGS) $(HOSTCXXFLAGS)
+KBUILD_HOSTCFLAGS   := $(KBUILD_USERHOSTCFLAGS) $(HOST_LFS_CFLAGS) \
+                      $(HOSTCFLAGS) -I $(srctree)/scripts/include
+KBUILD_HOSTCXXFLAGS := -Wall -O2 $(HOST_LFS_CFLAGS) $(HOSTCXXFLAGS) \
+                      -I $(srctree)/scripts/include
 KBUILD_HOSTRUSTFLAGS := $(rust_common_flags) -O -Cstrip=debuginfo \
                        -Zallow-features= $(HOSTRUSTFLAGS)
 KBUILD_HOSTLDFLAGS  := $(HOST_LFS_LDFLAGS) $(HOSTLDFLAGS)
index 6e47e0ad6e6eb1d7babcf226ce31e49594b9b51b..2bc96cd28253cf6b9fb53b8895239c34756e5eb8 100644 (file)
@@ -12,12 +12,11 @@ extern "C" {
 
 #include <assert.h>
 #include <stdio.h>
-#include "list_types.h"
 #ifndef __cplusplus
 #include <stdbool.h>
 #endif
 
-#include "list_types.h"
+#include <list_types.h>
 
 typedef enum tristate {
        no, mod, yes
index 6c721c4cfd72bd94370cc7e8c7f61332169bf3bd..02106eb7815e4eabe0766997a37fc5ba6adb5540 100644 (file)
@@ -2,7 +2,7 @@
 #ifndef INTERNAL_H
 #define INTERNAL_H
 
-#include "hashtable.h"
+#include <hashtable.h>
 
 #define SYMBOL_HASHSIZE                (1U << 14)
 
index 4a0a97bb342f6b8e6b80dba4bb862233cace0ae0..3887eac7528938474a03c8e96269ef3c0fb09d63 100644 (file)
@@ -19,7 +19,7 @@
 #include <signal.h>
 #include <unistd.h>
 
-#include "list.h"
+#include <list.h>
 #include "lkc.h"
 #include "lxdialog/dialog.h"
 #include "mnconf-common.h"
index cd34cc5aefcfcedef41a014936e90062f4cf2ece..323cc0b62be6c622d795843fe71e20fa40a753de 100644 (file)
@@ -8,9 +8,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <list.h>
 #include "lkc.h"
 #include "internal.h"
-#include "list.h"
 
 static const char nohelp_text[] = "There is no help available for this option.";
 
index 18cb9a6c5aaad648c4b7f04c5457bd4442064226..8e24b07121dfcc597bc8034313154bef17f23ef3 100644 (file)
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
+#include <list.h>
 #include "expr.h"
-#include "list.h"
 #include "mnconf-common.h"
 
 int jump_key_char;
index ab6292cc4bf255425ea782611389dce90f2522fe..53bd7292e93199ac33ccf876a5bc8819700fcff8 100644 (file)
@@ -4,6 +4,8 @@
 
 #include <stddef.h>
 
+#include <list_types.h>
+
 struct search_data {
        struct list_head *head;
        struct menu *target;
index 1456e24969aa5368fa12b3fec7fc50d577574a1b..b91ca47e9e9a0fb227e1c797617e55efd51b63e6 100644 (file)
@@ -11,7 +11,7 @@
 #include <strings.h>
 #include <stdlib.h>
 
-#include "list.h"
+#include <list.h>
 #include "lkc.h"
 #include "mnconf-common.h"
 #include "nconf.h"
index f0a4a218c4a5178a87722cc12e6ed6cb71baa82d..67d1fb95c4912c6824d51eb0607cf45689142c99 100644 (file)
@@ -9,9 +9,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "array_size.h"
+#include <array_size.h>
+#include <list.h>
 #include "internal.h"
-#include "list.h"
 #include "lkc.h"
 #include "preprocess.h"
 
index 1ea78927121d9a434370d200deea3bf6c2fb8ca9..696ff477671ecc788a0bb71e1ed7a136068e521b 100644 (file)
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "hashtable.h"
+#include <hashtable.h>
 #include "lkc.h"
 
 unsigned int strhash(const char *s)
diff --git a/scripts/mod/list.h b/scripts/mod/list.h
deleted file mode 100644 (file)
index a924a6c..0000000
+++ /dev/null
@@ -1,213 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef LIST_H
-#define LIST_H
-
-#include <stdbool.h>
-#include <stddef.h>
-
-/* Are two types/vars the same type (ignoring qualifiers)? */
-#define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
-
-/**
- * container_of - cast a member of a structure out to the containing structure
- * @ptr:       the pointer to the member.
- * @type:      the type of the container struct this is embedded in.
- * @member:    the name of the member within the struct.
- *
- */
-#define container_of(ptr, type, member) ({                             \
-       void *__mptr = (void *)(ptr);                                   \
-       _Static_assert(__same_type(*(ptr), ((type *)0)->member) ||      \
-                     __same_type(*(ptr), void),                        \
-                     "pointer type mismatch in container_of()");       \
-       ((type *)(__mptr - offsetof(type, member))); })
-
-#define LIST_POISON1  ((void *) 0x100)
-#define LIST_POISON2  ((void *) 0x122)
-
-/*
- * Circular doubly linked list implementation.
- *
- * Some of the internal functions ("__xxx") are useful when
- * manipulating whole lists rather than single entries, as
- * sometimes we already know the next/prev entries and we can
- * generate better code by using them directly rather than
- * using the generic single-entry routines.
- */
-
-struct list_head {
-       struct list_head *next, *prev;
-};
-
-#define LIST_HEAD_INIT(name) { &(name), &(name) }
-
-#define LIST_HEAD(name) \
-       struct list_head name = LIST_HEAD_INIT(name)
-
-/**
- * INIT_LIST_HEAD - Initialize a list_head structure
- * @list: list_head structure to be initialized.
- *
- * Initializes the list_head to point to itself.  If it is a list header,
- * the result is an empty list.
- */
-static inline void INIT_LIST_HEAD(struct list_head *list)
-{
-       list->next = list;
-       list->prev = list;
-}
-
-/*
- * Insert a new entry between two known consecutive entries.
- *
- * This is only for internal list manipulation where we know
- * the prev/next entries already!
- */
-static inline void __list_add(struct list_head *new,
-                             struct list_head *prev,
-                             struct list_head *next)
-{
-       next->prev = new;
-       new->next = next;
-       new->prev = prev;
-       prev->next = new;
-}
-
-/**
- * list_add - add a new entry
- * @new: new entry to be added
- * @head: list head to add it after
- *
- * Insert a new entry after the specified head.
- * This is good for implementing stacks.
- */
-static inline void list_add(struct list_head *new, struct list_head *head)
-{
-       __list_add(new, head, head->next);
-}
-
-/**
- * list_add_tail - add a new entry
- * @new: new entry to be added
- * @head: list head to add it before
- *
- * Insert a new entry before the specified head.
- * This is useful for implementing queues.
- */
-static inline void list_add_tail(struct list_head *new, struct list_head *head)
-{
-       __list_add(new, head->prev, head);
-}
-
-/*
- * Delete a list entry by making the prev/next entries
- * point to each other.
- *
- * This is only for internal list manipulation where we know
- * the prev/next entries already!
- */
-static inline void __list_del(struct list_head *prev, struct list_head *next)
-{
-       next->prev = prev;
-       prev->next = next;
-}
-
-static inline void __list_del_entry(struct list_head *entry)
-{
-       __list_del(entry->prev, entry->next);
-}
-
-/**
- * list_del - deletes entry from list.
- * @entry: the element to delete from the list.
- * Note: list_empty() on entry does not return true after this, the entry is
- * in an undefined state.
- */
-static inline void list_del(struct list_head *entry)
-{
-       __list_del_entry(entry);
-       entry->next = LIST_POISON1;
-       entry->prev = LIST_POISON2;
-}
-
-/**
- * list_is_head - tests whether @list is the list @head
- * @list: the entry to test
- * @head: the head of the list
- */
-static inline int list_is_head(const struct list_head *list, const struct list_head *head)
-{
-       return list == head;
-}
-
-/**
- * list_empty - tests whether a list is empty
- * @head: the list to test.
- */
-static inline int list_empty(const struct list_head *head)
-{
-       return head->next == head;
-}
-
-/**
- * list_entry - get the struct for this entry
- * @ptr:       the &struct list_head pointer.
- * @type:      the type of the struct this is embedded in.
- * @member:    the name of the list_head within the struct.
- */
-#define list_entry(ptr, type, member) \
-       container_of(ptr, type, member)
-
-/**
- * list_first_entry - get the first element from a list
- * @ptr:       the list head to take the element from.
- * @type:      the type of the struct this is embedded in.
- * @member:    the name of the list_head within the struct.
- *
- * Note, that list is expected to be not empty.
- */
-#define list_first_entry(ptr, type, member) \
-       list_entry((ptr)->next, type, member)
-
-/**
- * list_next_entry - get the next element in list
- * @pos:       the type * to cursor
- * @member:    the name of the list_head within the struct.
- */
-#define list_next_entry(pos, member) \
-       list_entry((pos)->member.next, typeof(*(pos)), member)
-
-/**
- * list_entry_is_head - test if the entry points to the head of the list
- * @pos:       the type * to cursor
- * @head:      the head for your list.
- * @member:    the name of the list_head within the struct.
- */
-#define list_entry_is_head(pos, head, member)                          \
-       (&pos->member == (head))
-
-/**
- * list_for_each_entry - iterate over list of given type
- * @pos:       the type * to use as a loop cursor.
- * @head:      the head for your list.
- * @member:    the name of the list_head within the struct.
- */
-#define list_for_each_entry(pos, head, member)                         \
-       for (pos = list_first_entry(head, typeof(*pos), member);        \
-            !list_entry_is_head(pos, head, member);                    \
-            pos = list_next_entry(pos, member))
-
-/**
- * list_for_each_entry_safe - iterate over list of given type. Safe against removal of list entry
- * @pos:       the type * to use as a loop cursor.
- * @n:         another type * to use as temporary storage
- * @head:      the head for your list.
- * @member:    the name of the list_head within the struct.
- */
-#define list_for_each_entry_safe(pos, n, head, member)                 \
-       for (pos = list_first_entry(head, typeof(*pos), member),        \
-               n = list_next_entry(pos, member);                       \
-            !list_entry_is_head(pos, head, member);                    \
-            pos = n, n = list_next_entry(n, member))
-
-#endif /* LIST_H */
index 3e5313ed6065f98a58f27f9a30158d791dcb564b..9eade18b43882d67fd5b969a38f758053ce3cbbe 100644 (file)
@@ -20,6 +20,8 @@
 #include <limits.h>
 #include <stdbool.h>
 #include <errno.h>
+
+#include <list.h>
 #include "modpost.h"
 #include "../../include/linux/license.h"
 
index ee43c795063682b440818cd3a81ba5355afba456..58197b34a3c851113ece9230352f9e213233e706 100644 (file)
@@ -13,7 +13,7 @@
 #include <elf.h>
 #include "../../include/linux/module_symbol.h"
 
-#include "list.h"
+#include <list_types.h>
 #include "elfconfig.h"
 
 /* On BSD-alike OSes elf.h defines these according to host's word size */