Linus Torvalds b01d4e6893 x86: fix compile error due to X86_TRAP_NMI use in asm files ... It's an enum, not a #define, you can't use it in asm files. Introduced in commit 5fa10196bd ("x86: Ignore NMIs that come in during early boot"), and sadly I didn't compile-test things like I should have before pushing out. My weak excuse is that the x86 tree generally doesn't introduce stupid things like this (and the ARM pull afterwards doesn't cause me to do a compile-test either, since I don't cross-compile). Cc: Don Zickus <dzickus@redhat.com> Cc: H. Peter Anvin <hpa@linux.intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2014-03-07 18:58:40 -08:00
..
boot	x86, kaslr: add missed "static" declarations	2014-02-25 16:59:29 -08:00
configs	x86, defconfig: Add DEVTMPFS and DEVTMPFS_MOUNT to *86*_defconfig	2013-11-04 20:01:55 -08:00
crypto	crypto: aesni - fix build on x86 (32bit)	2014-01-15 11:36:34 +08:00
ia32	constify copy_siginfo_to_user{,32}()	2013-11-09 00:16:29 -05:00
include	* Disable the new EFI 1:1 virtual mapping for SGI UV because using it	2014-03-04 15:50:06 -08:00
kernel	x86: fix compile error due to X86_TRAP_NMI use in asm files	2014-03-07 18:58:40 -08:00
kvm	kvm, vmx: Really fix lazy FPU on nested guest	2014-02-27 22:54:11 +01:00
lguest	x86, asmlinkage, lguest: Fix C functions used by inline assembler	2014-01-29 22:17:17 -08:00
lib	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-01-25 11:17:34 -08:00
math-emu	x86: math-emu: Drop already-disabled print of build date	2014-01-27 23:14:12 +01:00
mm	x86, trace: Further robustify CR2 handling vs tracing	2014-03-06 10:58:18 -08:00
net	bpf: do not use reciprocal divide	2014-01-15 17:02:08 -08:00
oprofile	perf: Fix arch_perf_out_copy_user default	2013-11-06 12:34:25 +01:00
pci	ACPI and power management updates for 3.14-rc1	2014-01-24 15:51:02 -08:00
platform	x86/efi: Quirk out SGI UV	2014-03-04 23:43:33 +00:00
power	x86, asmlinkage, power: Make various symbols used by the suspend asm code visible	2013-08-06 14:21:03 -07:00
realmode	Merge commit 'f4bcd8ccddb02833340652e9f46f5127828eb79d' into x86/build	2014-01-29 09:07:00 -08:00
syscalls	sched: Add new scheduler syscalls to support an extended scheduling parameters ABI	2014-01-13 13:41:04 +01:00
tools	Merge commit 'f4bcd8ccddb02833340652e9f46f5127828eb79d' into x86/build	2014-01-29 09:07:00 -08:00
um	um, x86: Fix vDSO build	2014-01-12 16:47:31 +01:00
vdso	Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-01-20 12:03:57 -08:00
video
xen	xen: properly account for _PAGE_NUMA during xen pte translations	2014-02-10 16:01:41 -08:00
.gitignore
Kbuild
Kconfig	* Avoid WARN_ON() when mapping BGRT on Baytrail (EFI 32-bit).	2014-02-07 11:27:30 -08:00
Kconfig.cpu	x86, 386 removal: Document Nx586 as a 386 and thus unsupported	2012-11-29 13:28:39 -08:00
Kconfig.debug	x86: Disable CONFIG_X86_DECODER_SELFTEST in allmod/allyesconfigs	2014-02-05 14:10:30 -08:00
Makefile	x86, build: Build 16-bit code with -m16 where possible	2014-01-30 08:05:36 -08:00
Makefile_32.cpu	x86, 386 removal: Remove CONFIG_M386 from Kconfig	2012-11-29 13:23:01 -08:00
Makefile.um