On 7/4/22 14:19, Tom Rini wrote:
On Sat, Jul 02, 2022 at 03:23:42PM +0200, Heinrich Schuchardt wrote:
CONFIG_SYS_64BIT_LBA is defined in common.h and used to define the size of lbaint_t in blk.h. On 32-bit system not including common.h first will lead to differences in the size of lbaint_t between modules.
common.h should always be the first include.
Signed-off-by: Heinrich Schuchardt heinrich.schuchardt@canonical.com
cmd/pvblock.c | 2 +- drivers/xen/pvblock.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmd/pvblock.c b/cmd/pvblock.c index 56ce8b18d5..ccdd6304af 100644 --- a/cmd/pvblock.c +++ b/cmd/pvblock.c @@ -5,8 +5,8 @@
- XEN para-virtualized block device support
*/
-#include <blk.h> #include <common.h> +#include <blk.h> #include <command.h>
/* Current I/O Device */ diff --git a/drivers/xen/pvblock.c b/drivers/xen/pvblock.c index c25c3ea4ff..c0a156fbf7 100644 --- a/drivers/xen/pvblock.c +++ b/drivers/xen/pvblock.c @@ -6,8 +6,8 @@
#define LOG_CATEGORY UCLASS_PVBLOCK
-#include <blk.h> #include <common.h> +#include <blk.h> #include <dm.h> #include <dm/device-internal.h> #include <malloc.h>
Did you find a problem here, by inspection? If so, OK, I'll take this for master. Otherwise, please drop common.h from the file and see what includes it needs directly, given that -next has the CONFIG symbol in question migrated to Kconfig and so solves the overall problem.
You already merged 054de212cef6 ("disk: honor CONFIG_SYS_64BIT_LBA"). I looked for other uses of blk.h without prior inclusion of common.h.
Migration to Kconfig does not move the definition of CONFIG_SYS_64BIT_LBA into blk.h but keeps it in common.h. So the correct size of lbaint_t will still depend on including common.h.
Best regards
Heinrich