Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-27 05:11:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

asm-generic: arch/alpha regression fix for 6.1

Browse Source 
A last-minute regression fix in the previous asm-generic
 branch contained a new regression from a typo.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmNJx8IACgkQmmx57+YA
 GNnwUQ/+NOgyvGGEUa159HGPV83tYh35JKPyM4Vye7j24hJ2cFeGjfEBM4a386aw
 XRo8/9lWj8EegbCqQaba8eYVNo/wNd0fBwj05eMFlYY8pNOyoQH1c9pFAGk4snve
 YOGoYbvQkdNL2cG6XSbnKM5o6jvnS7ZXKE2LNNOJX+co5kWOkO0Hgidzi7RyXzSL
 Xw5tgX8+gtiA2KyksiAUWEGj1muWTO8mHfVWsnao1N2g3St9IWU7AGv3If5vg/Pb
 lpfyfZkLzDKTmgvqqxI1L76UVD5DD9uE2y4Cs0QkiL5DZZGj1Kwxc+sxhmRm+/5U
 qKdpLIndXVhB0koaggz96rPF0cKO11t139wiC4AbByV/6nd1ri5V769updOCreVa
 m7UHpJgAjuVKh8VNgd566CuQvNE0Pi4eKEdZcKnP+4yrTjVc2VpZ26P13912vJgL
 DIOTPtpi/RsjdxrCU+GOkdssfYR4IcIuE6AUQLO0MM8XU24u80GThmQaXbRux16d
 nVpKzL95ncEfEnTJXWAmBb6bQB9mDDjYc9krL0bv7OJlKDpSQx77JAjZmo5b2jd9
 3wR90Es7foUvyT4nIYOhCHQOOg62oqJzf0heGslKcTYM3DYS/Xaj70mM+/dRya5o
 eyqmkKoWXX+Xox0VAhWGleeHTKlF7WKWIkec052Fpi7ucyIzKlI=
 =mNEb
 -----END PGP SIGNATURE-----

Merge tag 'asm-generic-fixes-6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

Pull asm-generic fix from Arnd Bergmann:
 "A last-minute arch/alpha regression fix: the previous asm-generic
  branch contained a new regression from a typo"

* tag 'asm-generic-fixes-6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  alpha: fix marvel_ioread8 build regression
This commit is contained in:
Linus Torvalds 2022-10-14 13:47:42 -07:00
commit 73344a3f67
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/alpha/kernel/core_marvel.c
View File

@ -803,7 +803,7 @@ void __iomem *marvel_ioportmap (unsigned long addr)
return (void __iomem *)addr; return (void __iomem *)addr;
} }
unsigned u8 u8
marvel_ioread8(const void __iomem *xaddr) marvel_ioread8(const void __iomem *xaddr)
{ {
unsigned long addr = (unsigned long) xaddr; unsigned long addr = (unsigned long) xaddr;