diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-15 11:52:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-15 11:52:47 -0800 |
| commit | 908bfda754a9e972c4728832513b11153bd3a140 (patch) | |
| tree | 64181a7a70f2ad49ae01042f9284d190f7c51d7f /include | |
| parent | 9199c4caa1315c31d160abbd166df0b9a9e8551e (diff) | |
| parent | 04bf9ba720fcc4fa313fa122b799ae0989b6cd50 (diff) | |
| download | linux-908bfda754a9e972c4728832513b11153bd3a140.tar.gz linux-908bfda754a9e972c4728832513b11153bd3a140.tar.bz2 linux-908bfda754a9e972c4728832513b11153bd3a140.zip | |
Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Peter Anvin:
"This is a pretty small batch:
The biggest single change is to stop using EFI time services on 32-bit
platforms. This matches our current behavior on 64-bit platforms as
we already had ruled them out there as being too unreliable. Turns
out that affects 32-bit platforms, too.
One NULL pointer fix for SGI UV.
Two minor build fixes, one of which only affects icc and the other
which affects icc and future versions or nonstandard default settings
of gcc"
* 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, efi: Don't use (U)EFI time services on 32 bit
x86, build, icc: Remove uninitialized_var() from compiler-intel.h
x86/UV: Fix NULL pointer dereference in uv_flush_tlb_others() if the 'nobau' boot option is used
x86, build: Pass in additional -mno-mmx, -mno-sse options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/compiler-intel.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/compiler-intel.h b/include/linux/compiler-intel.h index 973ce10c40b6..dc1bd3dcf11f 100644 --- a/include/linux/compiler-intel.h +++ b/include/linux/compiler-intel.h @@ -28,8 +28,6 @@ #endif -#define uninitialized_var(x) x - #ifndef __HAVE_BUILTIN_BSWAP16__ /* icc has this, but it's called _bswap16 */ #define __HAVE_BUILTIN_BSWAP16__ |