diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-24 19:16:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-24 19:16:20 -0700 |
| commit | 976fb3f7b92e91aeccb87de60128a1e65edd676f (patch) | |
| tree | f5959ad474b401e4ed65a53faf2594b93dc885f1 /scripts | |
| parent | 9d854607f9005c593dca9672b708f28e6ef96fe4 (diff) | |
| parent | 119a0a3c13ef5ffe78dc0c1a55c5da9e377b2976 (diff) | |
| download | linux-976fb3f7b92e91aeccb87de60128a1e65edd676f.tar.gz linux-976fb3f7b92e91aeccb87de60128a1e65edd676f.tar.bz2 linux-976fb3f7b92e91aeccb87de60128a1e65edd676f.zip | |
Merge branch 'parisc-4.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc updates from Helge Deller:
"This patchset adds stack usage debug info for parisc and metag (on
both the stack grows upwards), switches to the new generic realative
extable search and sort routines, drops the long time ago removed
syscalls alloc_hugepages and free_hugepages and wires up the new
preadv2 and pwritev2 syscalls"
* 'parisc-4.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Wire up preadv2 and pwritev2 syscalls
parisc: Use generic extable search and sort routines
parisc: Panic immediately when panic_on_oops
parisc,metag: Implement CONFIG_DEBUG_STACK_USAGE option
parisc: Drop alloc_hugepages and free_hugepages syscalls
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/sortextable.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/sortextable.c b/scripts/sortextable.c index 62a1822e0f41..f453b7ce99d6 100644 --- a/scripts/sortextable.c +++ b/scripts/sortextable.c @@ -315,6 +315,7 @@ do_file(char const *const fname) case EM_S390: case EM_AARCH64: + case EM_PARISC: custom_sort = sort_relative_table; break; case EM_ARCOMPACT: |