diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-29 15:02:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-29 15:02:40 -0700 |
| commit | c38239b4be1ac7e4bcf5bbd971353bae51525b8f (patch) | |
| tree | 0603687897074068a6ec9cde44486b5ed49b6397 /arch/parisc/include | |
| parent | 57dbde63f2888af1be5111d369d124f4e659c0f8 (diff) | |
| parent | c9fa406f62ec952bc4689b5120a02759ce42a68d (diff) | |
Merge branch 'parisc-4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc updates from Helge Deller:
"Three small patches:
- A boot fix for A500 machines, crash was caused by the new
alternative patching code from this merge window (Dave)
- Change __kernel_suseconds_t to match glibc on 64-bit parisc (Arnd)
- Use constants instead of hard-coded numbers (me)"
* 'parisc-4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Fix A500 boot crash
parisc: Use LINUX_GATEWAY_SPACE constant in entry.S
parisc64: change __kernel_suseconds_t to match glibc
Diffstat (limited to 'arch/parisc/include')
| -rw-r--r-- | arch/parisc/include/uapi/asm/posix_types.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/parisc/include/uapi/asm/posix_types.h b/arch/parisc/include/uapi/asm/posix_types.h index 2785632c85e7..8dce56f5dcee 100644 --- a/arch/parisc/include/uapi/asm/posix_types.h +++ b/arch/parisc/include/uapi/asm/posix_types.h @@ -16,9 +16,6 @@ typedef unsigned short __kernel_mode_t; typedef unsigned short __kernel_ipc_pid_t; #define __kernel_ipc_pid_t __kernel_ipc_pid_t -typedef int __kernel_suseconds_t; -#define __kernel_suseconds_t __kernel_suseconds_t - typedef long long __kernel_off64_t; typedef unsigned long long __kernel_ino64_t; |