diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-13 20:28:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-13 20:28:16 -0400 |
| commit | 2fd7476de999124bbf6830aa59ac092c882280fe (patch) | |
| tree | 81522f679ccdf38067e03102d2b64e44fc777204 /arch/x86/boot/compressed | |
| parent | ba1a96fc7ddcaf0c8d4a6752f6a70f080bc307ac (diff) | |
| parent | 4ea48a01bb1a99f4185b77cd90cf962730336cc4 (diff) | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Misc smaller fixes that missed the v3.17 cycle"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/build: Add arch/x86/purgatory/ make generated files to gitignore
x86: Fix section conflict for numachip
x86: Reject x32 executables if x32 ABI not supported
x86_64, entry: Filter RFLAGS.NT on entry from userspace
x86, boot, kaslr: Fix nuisance warning on 32-bit builds
Diffstat (limited to 'arch/x86/boot/compressed')
| -rw-r--r-- | arch/x86/boot/compressed/aslr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/compressed/aslr.c b/arch/x86/boot/compressed/aslr.c index 7c68808edeb7..bb1376381985 100644 --- a/arch/x86/boot/compressed/aslr.c +++ b/arch/x86/boot/compressed/aslr.c | |||
| @@ -194,7 +194,7 @@ static bool mem_avoid_overlap(struct mem_vector *img) | |||
| 194 | while (ptr) { | 194 | while (ptr) { |
| 195 | struct mem_vector avoid; | 195 | struct mem_vector avoid; |
| 196 | 196 | ||
| 197 | avoid.start = (u64)ptr; | 197 | avoid.start = (unsigned long)ptr; |
| 198 | avoid.size = sizeof(*ptr) + ptr->len; | 198 | avoid.size = sizeof(*ptr) + ptr->len; |
| 199 | 199 | ||
| 200 | if (mem_overlaps(img, &avoid)) | 200 | if (mem_overlaps(img, &avoid)) |