H. Peter Anvin 49b8c695e3 Merge branch 'x86/fpu' into x86/smap ...

Reason for merge:
       x86/fpu changed the structure of some of the code that x86/smap
       changes; mostly fpu-internal.h but also minor changes to the
       signal code.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

Resolved Conflicts:
	arch/x86/ia32/ia32_signal.c
	arch/x86/include/asm/fpu-internal.h
	arch/x86/kernel/signal.c

2012-09-21 17:18:44 -07:00

..

boot

x86, build: Globally set -fno-pic

2012-08-10 16:12:30 -07:00

configs

x86/kconfig: Remove CONFIG_TR=y from the defconfigs

2012-03-24 08:18:03 +01:00

crypto

crypto: twofish-avx - remove useless instruction

2012-07-11 11:08:30 +08:00

ia32

Merge branch 'x86/fpu' into x86/smap

2012-09-21 17:18:44 -07:00

include/asm

Merge branch 'x86/fpu' into x86/smap

2012-09-21 17:18:44 -07:00

kernel

Merge branch 'x86/fpu' into x86/smap

2012-09-21 17:18:44 -07:00

kvm

x86, kvm: fix kvm's usage of kernel_fpu_begin/end()

2012-09-21 16:59:04 -07:00

lguest

lguest: Make sure interrupt is allocated ok by lguest_setup_irq

2012-01-12 15:44:47 +10:30

lib

x86, smap: Add STAC and CLAC instructions to control user space access

2012-09-21 12:45:27 -07:00

math-emu

x86: Rename trap_no to trap_nr in thread_struct

2012-03-13 06:24:09 +01:00

mm

x86, smap: A page fault due to SMAP is an oops

2012-09-21 12:45:27 -07:00

net

x86 bpf_jit: support BPF_S_ANC_ALU_XOR_X instruction

2012-06-06 09:42:44 -07:00

oprofile

perf/x86/amd: Unify AMD's generic and family 15h pmus

2012-07-05 21:19:41 +02:00

pci

Merge branch 'pci/myron-pcibios_setup' into next

2012-07-05 15:31:05 -06:00

platform

Revert "x86-64/efi: Use EFI to deal with platform wall clock"

2012-08-14 09:58:25 -07:00

power

x86, kvm: Call restore_sched_clock_state() only after %gs is initialized

2012-04-02 13:53:00 +02:00

realmode

x86, build: Globally set -fno-pic

2012-08-10 16:12:30 -07:00

syscalls

x32: Use compat shims for {g,s}etsockopt

2012-08-18 14:15:39 -07:00

tools

x86/decoder: Fix bsr/bsf/jmpe decoding with operand-size prefix

2012-06-06 08:54:18 +02:00

um

um: switch UPT_SET_RETURN_VALUE and regs_return_value to pt_regs

2012-08-01 23:33:16 +02:00

vdso

x86, cpu: Rename checking_wrmsrl() to wrmsrl_safe()

2012-06-07 13:32:04 -07:00

video

x86: Use vga_default_device() when determining whether an fb is primary

2012-04-24 09:50:17 +01:00

xen

Three bug-fixes:

2012-08-25 17:31:59 -07:00

.gitignore

x86/kprobes: Add arch/x86/tools/insn_sanity to .gitignore

2012-01-16 08:21:59 +01:00

Kbuild

x86, realmode: realmode.bin infrastructure

2012-05-08 11:41:48 -07:00

Kconfig

x86, smap: Add a header file with macros for STAC/CLAC

2012-09-21 12:45:26 -07:00

Kconfig.cpu

x86: Tighten dependencies of CPU_SUP_*_32

2012-03-08 10:57:34 +01:00

Kconfig.debug

x86/tlb: add tlb_flushall_shift knob into debugfs

2012-06-27 19:29:10 -07:00

Makefile

x86, build: Globally set -fno-pic

2012-08-10 16:12:30 -07:00

Makefile_32.cpu

…

Makefile.um

um: fix linker script generation

2012-04-09 13:59:00 -04:00