[PATCH 1/1] xen: pvblock: honor CONFIG_SYS_64BIT_LBA

Tom Rini trini at konsulko.com
Mon Jul 4 14:19:17 CEST 2022


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 at 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.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20220704/f275469f/attachment.sig>


More information about the U-Boot mailing list