diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2022-09-18 13:26:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-09-18 13:26:59 -0700 |
| commit | 7c18b453ef7237bc25b7cbd425a05ac1b6fb074b (patch) | |
| tree | 4d834a51e24bf12bdec5e5a68877cddf27082256 /tools | |
| parent | Merge tag 'io_uring-6.0-2022-09-18' of git://git.kernel.dk/linux (diff) | |
| parent | parisc: Allow CONFIG_64BIT with ARCH=parisc (diff) | |
| download | linux-dev-7c18b453ef7237bc25b7cbd425a05ac1b6fb074b.tar.xz linux-dev-7c18b453ef7237bc25b7cbd425a05ac1b6fb074b.zip | |
Merge tag 'parisc-for-6.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc architecture fixes from Helge Deller:
"Some small parisc architecture fixes for 6.0-rc6:
One patch lightens up a previous commit and thus unbreaks building the
debian kernel, which tries to configure a 64-bit kernel with the
ARCH=parisc environment variable set.
The other patches fixes asm/errno.h includes in the tools directory
and cleans up memory allocation in the iosapic driver.
Summary:
- Allow configuring 64-bit kernel with ARCH=parisc
- Fix asm/errno.h includes in tools directory for parisc and xtensa
- Clean up iosapic memory allocation
- Minor typo and spelling fixes"
* tag 'parisc-for-6.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Allow CONFIG_64BIT with ARCH=parisc
parisc: remove obsolete manual allocation aligning in iosapic
tools/include/uapi: Fix <asm/errno.h> for parisc and xtensa
Input: hp_sdc: fix spelling typo in comment
parisc: ccio-dma: Add missing iounmap in error path in ccio_probe()
Diffstat (limited to '')
| -rw-r--r-- | tools/include/uapi/asm/errno.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/include/uapi/asm/errno.h b/tools/include/uapi/asm/errno.h index d30439b4b8ab..869379f91fe4 100644 --- a/tools/include/uapi/asm/errno.h +++ b/tools/include/uapi/asm/errno.h @@ -9,8 +9,8 @@ #include "../../../arch/alpha/include/uapi/asm/errno.h" #elif defined(__mips__) #include "../../../arch/mips/include/uapi/asm/errno.h" -#elif defined(__xtensa__) -#include "../../../arch/xtensa/include/uapi/asm/errno.h" +#elif defined(__hppa__) +#include "../../../arch/parisc/include/uapi/asm/errno.h" #else #include <asm-generic/errno.h> #endif |