2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-20 11:13:58 +08:00
linux-next/arch/x86/um
Linus Torvalds 269af9a1a0 Merge branch 'x86-extable-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull exception table generation updates from Ingo Molnar:
 "The biggest change here is to allow the build-time sorting of the
  exception table, to speed up booting.  This is achieved by the
  architecture enabling BUILDTIME_EXTABLE_SORT.  This option is enabled
  for x86 and MIPS currently.

  On x86 a number of fixes and changes were needed to allow build-time
  sorting of the exception table, in particular a relocation invariant
  exception table format was needed.  This required the abstracting out
  of exception table protocol and the removal of 20 years of accumulated
  assumptions about the x86 exception table format.

  While at it, this tree also cleans up various other aspects of
  exception handling, such as early(er) exception handling for
  rdmsr_safe() et al.

  All in one, as the result of these changes the x86 exception code is
  now pretty nice and modern.  As an added bonus any regressions in this
  code will be early and violent crashes, so if you see any of those,
  you'll know whom to blame!"

Fix up trivial conflicts in arch/{mips,x86}/Kconfig files due to nearby
modifications of other core architecture options.

* 'x86-extable-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (35 commits)
  Revert "x86, extable: Disable presorted exception table for now"
  scripts/sortextable: Handle relative entries, and other cleanups
  x86, extable: Switch to relative exception table entries
  x86, extable: Disable presorted exception table for now
  x86, extable: Add _ASM_EXTABLE_EX() macro
  x86, extable: Remove open-coded exception table entries in arch/x86/ia32/ia32entry.S
  x86, extable: Remove open-coded exception table entries in arch/x86/include/asm/xsave.h
  x86, extable: Remove open-coded exception table entries in arch/x86/include/asm/kvm_host.h
  x86, extable: Remove the now-unused __ASM_EX_SEC macros
  x86, extable: Remove open-coded exception table entries in arch/x86/xen/xen-asm_32.S
  x86, extable: Remove open-coded exception table entries in arch/x86/um/checksum_32.S
  x86, extable: Remove open-coded exception table entries in arch/x86/lib/usercopy_32.c
  x86, extable: Remove open-coded exception table entries in arch/x86/lib/putuser.S
  x86, extable: Remove open-coded exception table entries in arch/x86/lib/getuser.S
  x86, extable: Remove open-coded exception table entries in arch/x86/lib/csum-copy_64.S
  x86, extable: Remove open-coded exception table entries in arch/x86/lib/copy_user_nocache_64.S
  x86, extable: Remove open-coded exception table entries in arch/x86/lib/copy_user_64.S
  x86, extable: Remove open-coded exception table entries in arch/x86/lib/checksum_32.S
  x86, extable: Remove open-coded exception table entries in arch/x86/kernel/test_rodata.c
  x86, extable: Remove open-coded exception table entries in arch/x86/kernel/entry_64.S
  ...
2012-05-23 10:44:35 -07:00
..
asm um/x86: merge (and trim) 32- and 64-bit variants of ptrace.h 2012-05-21 16:28:34 -04:00
os-Linux
shared/sysdep um/x86: merge (and trim) 32- and 64-bit variants of ptrace.h 2012-05-21 16:28:34 -04:00
vdso coredump: remove VM_ALWAYSDUMP flag 2012-03-23 16:58:42 -07:00
bug.c
bugs_32.c um: kill HOST_TASK_PID 2012-03-25 00:29:55 +01:00
bugs_64.c
checksum_32.S x86, extable: Remove open-coded exception table entries in arch/x86/um/checksum_32.S 2012-04-20 13:51:39 -07:00
delay.c
elfcore.c
fault.c
Kconfig um: allow SUBARCH=x86 2012-03-25 00:29:56 +01:00
ksyms.c
ldt.c
Makefile x86, um: Use the same style generated syscall tables as native 2011-12-05 16:08:49 -08:00
mem_32.c coredump: remove VM_ALWAYSDUMP flag 2012-03-23 16:58:42 -07:00
mem_64.c
ptrace_32.c
ptrace_64.c
ptrace_user.c
setjmp_32.S
setjmp_64.S
signal.c um: missing checks of __put_user()/__get_user() return values 2012-05-21 16:29:02 -04:00
stub_32.S
stub_64.S
stub_segv.c
sys_call_table_32.c x86, um: Fix typo in 32-bit system call modifications 2011-12-09 11:13:59 -08:00
sys_call_table_64.c um: stub_rt_sigsuspend isn't needed these days anymore 2012-05-21 16:29:01 -04:00
syscalls_32.c um: missing checks of __put_user()/__get_user() return values 2012-05-21 16:29:02 -04:00
syscalls_64.c
sysrq_32.c um/x86: merge (and trim) 32- and 64-bit variants of ptrace.h 2012-05-21 16:28:34 -04:00
sysrq_64.c um/x86: merge (and trim) 32- and 64-bit variants of ptrace.h 2012-05-21 16:28:34 -04:00
tls_32.c um/x86: merge (and trim) 32- and 64-bit variants of ptrace.h 2012-05-21 16:28:34 -04:00
tls_64.c
user-offsets.c x32: Add x32 system calls to syscall/syscall_64.tbl 2012-02-20 12:48:49 -08:00