diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-31 15:32:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-31 15:32:05 -0700 |
| commit | 26847fa6eb4fd653171f86d249caa761ce1e87c7 (patch) | |
| tree | 8b315fd9fb903b1c3a942389a7be0580de5cd184 /scripts | |
| parent | 08843b79fb35d33859e0f8f11a7318341076e4d1 (diff) | |
| parent | 7d25617597ff8dcfe4d0e1d0ac9214e7cc7ded92 (diff) | |
| download | op-kernel-dev-26847fa6eb4fd653171f86d249caa761ce1e87c7.zip op-kernel-dev-26847fa6eb4fd653171f86d249caa761ce1e87c7.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 updates from Martin Schwidefsky:
"This it the second batch of s390 patches for the 3.6 merge window.
Included is enablement for two common code changes, killable page
faults and sorted exception tables. And the regular set of cleanup
and bug fix patches."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390: make use of user_mode() macro where possible
s390/mm: rename user_mode variable to addressing_mode
s390/mm: fix fault handling for page table walk case
s390/mm: make page faults killable
s390: update defconfig
s390/mm: downgrade page table after fork of a 31 bit process
s390/ipl: Use diagnose 8 command separation
s390/linker script: use RO_DATA_SECTION
s390/exceptions: sort exception table at build time
s390/debug: remove module_exit function / move EXPORT_SYMBOLs
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 1ca9ceb..6acf834 100644 --- a/scripts/sortextable.c +++ b/scripts/sortextable.c @@ -247,6 +247,7 @@ do_file(char const *const fname) case EM_X86_64: custom_sort = sort_x86_table; break; + case EM_S390: case EM_MIPS: break; } /* end switch */ |
