scripts/gdb: Fix importing SB_ constants

Message ID 20230627124332.82758-1-jackmanb@google.com
State New
Headers
Series scripts/gdb: Fix importing SB_ constants |

Commit Message

Brendan Jackman June 27, 2023, 12:43 p.m. UTC
  Commit f15afbd34d8f ("fs: fix undefined behavior in bit shift for
SB_NOUSER") switched these defines over to use BIT which when,
!__ASSEMBLY__, expands to something equivalent to 1UL << x. The UL
suffix isn't valid python.

Luckily we already seem to have a facility in the preprocessed code to
handle cases like this.

Signed-off-by: Brendan Jackman <jackmanb@google.com>
---
 scripts/gdb/linux/constants.py.in | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
  

Comments

Brendan Jackman June 27, 2023, 12:46 p.m. UTC | #1
On Tue, 27 Jun 2023 at 14:43, Brendan Jackman <jackmanb@google.com> wrote:
>
> Commit f15afbd34d8f ("fs: fix undefined behavior in bit shift for
> SB_NOUSER") switched these defines over to use BIT which when,
> !__ASSEMBLY__, expands to something equivalent to 1UL << x. The UL
> suffix isn't valid python.
>
> Luckily we already seem to have a facility in the preprocessed code to
> handle cases like this.

Oh. After sending I realised my tree was stale! This was already fixed
by Florian in 6a59cb5158bff1.

Please ignore :)
  

Patch

diff --git a/scripts/gdb/linux/constants.py.in b/scripts/gdb/linux/constants.py.in
index 471300ba176c..50a92c4e9984 100644
--- a/scripts/gdb/linux/constants.py.in
+++ b/scripts/gdb/linux/constants.py.in
@@ -48,12 +48,12 @@  if IS_BUILTIN(CONFIG_COMMON_CLK):
     LX_GDBPARSED(CLK_GET_RATE_NOCACHE)
 
 /* linux/fs.h */
-LX_VALUE(SB_RDONLY)
-LX_VALUE(SB_SYNCHRONOUS)
-LX_VALUE(SB_MANDLOCK)
-LX_VALUE(SB_DIRSYNC)
-LX_VALUE(SB_NOATIME)
-LX_VALUE(SB_NODIRATIME)
+LX_GDBPARSED(SB_RDONLY)
+LX_GDBPARSED(SB_SYNCHRONOUS)
+LX_GDBPARSED(SB_MANDLOCK)
+LX_GDBPARSED(SB_DIRSYNC)
+LX_GDBPARSED(SB_NOATIME)
+LX_GDBPARSED(SB_NODIRATIME)
 
 /* linux/htimer.h */
 LX_GDBPARSED(hrtimer_resolution)