diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-22 14:06:37 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-22 14:06:37 -0700 |
commit | 45b74a65b9934d5e1520d97aa4e09cf2b8c69ac0 (patch) | |
tree | 7c451271a6c274da9b7f37fcb2592d4cfc972644 /arch/parisc/include/asm/linkage.h | |
parent | 433bcf67370bc170a345634aa1be4ee8ac905de9 (diff) | |
parent | dbf2a4b1ffab2867505be3b24221d5efa2200c91 (diff) | |
download | linux-45b74a65b9934d5e1520d97aa4e09cf2b8c69ac0.tar.bz2 |
Merge branch 'parisc-4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull more parisc updates from Helge Deller:
- fix boot failure of 64-bit kernel. It got broken by the unwind
optimization commit in merge window.
- fix 64-bit userspace support (static 64-bit applications only, e.g.
we don't yet have 64-bit userspace support in glibc).
- consolidate unwind initialization code.
- add machine model description to stack trace.
* 'parisc-4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Add hardware description to stack traces
parisc: Fix boot failure of 64-bit kernel
parisc: Consolidate unwind initialization calls
parisc: Update comments in syscall.S regarding wide userland
parisc: Fix ptraced 64-bit applications to call 64-bit syscalls
parisc: Restore possibility to execute 64-bit applications
Diffstat (limited to 'arch/parisc/include/asm/linkage.h')
-rw-r--r-- | arch/parisc/include/asm/linkage.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/parisc/include/asm/linkage.h b/arch/parisc/include/asm/linkage.h index 49f6f3d772cc..cd6fe4febead 100644 --- a/arch/parisc/include/asm/linkage.h +++ b/arch/parisc/include/asm/linkage.h @@ -22,15 +22,6 @@ name: ASM_NL\ .export name -#ifdef CONFIG_64BIT -#define ENDPROC(name) \ - END(name) -#else -#define ENDPROC(name) \ - .type name, @function !\ - END(name) -#endif - #define ENTRY_CFI(name, ...) \ ENTRY(name) ASM_NL\ .proc ASM_NL\ |