Skip to content

Commit

Permalink
Merge tag 'for-5.15/parisc-2' of git://git.kernel.org/pub/scm/linux/k…
Browse files Browse the repository at this point in the history
…ernel/git/deller/parisc-linux

Pull parisc architecture fixes from Helge Deller:
 "Fix an unaligned-access crash in the bootloader and drop asm/swab.h"

* tag 'for-5.15/parisc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Fix unaligned-access crash in bootloader
  parisc: Drop __arch_swab16(), arch_swab24(), _arch_swab32() and __arch_swab64() functions
  • Loading branch information
Linus Torvalds committed Sep 3, 2021
2 parents d674221 + c42813b commit 11d5576
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 69 deletions.
2 changes: 1 addition & 1 deletion arch/parisc/boot/compressed/misc.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
extern char input_data[];
extern int input_len;
/* output_len is inserted by the linker possibly at an unaligned address */
extern __le32 output_len __aligned(1);
extern char output_len;
extern char _text, _end;
extern char _bss, _ebss;
extern char _startcode_end;
Expand Down
68 changes: 0 additions & 68 deletions arch/parisc/include/uapi/asm/swab.h

This file was deleted.

0 comments on commit 11d5576

Please sign in to comment.