diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-12-06 23:22:48 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-12-06 23:22:48 -0800 |
commit | 55b224d90d44d794c1afab046c4fd9dc8be9247d (patch) | |
tree | 1f7461dc5b4b8bacda6224be67231ae56471aff3 | |
parent | Merge tag 'for-linus-iommufd' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
parent | parisc: Fix asm operand number out of range build error in bug table (diff) | |
download | linux-55b224d90d44d794c1afab046c4fd9dc8be9247d.tar.gz linux-55b224d90d44d794c1afab046c4fd9dc8be9247d.tar.bz2 linux-55b224d90d44d794c1afab046c4fd9dc8be9247d.zip |
Merge tag 'parisc-for-6.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fix from Helge Deller:
"A single line patch for parisc which fixes the build in tinyconfig
configurations:
- Fix asm operand number out of range build error in bug table"
* tag 'parisc-for-6.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Fix asm operand number out of range build error in bug table
-rw-r--r-- | arch/parisc/include/asm/bug.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/include/asm/bug.h b/arch/parisc/include/asm/bug.h index 1641ff9a8b83..833555f74ffa 100644 --- a/arch/parisc/include/asm/bug.h +++ b/arch/parisc/include/asm/bug.h @@ -71,7 +71,7 @@ asm volatile("\n" \ "1:\t" PARISC_BUG_BREAK_ASM "\n" \ "\t.pushsection __bug_table,\"a\"\n" \ - "\t.align %2\n" \ + "\t.align 4\n" \ "2:\t" __BUG_REL(1b) "\n" \ "\t.short %0\n" \ "\t.blockz %1-4-2\n" \ |