diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 11:34:07 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 11:34:07 -0400 |
| commit | 874f6d1be7699b5d1873283b4737712cbabd7754 (patch) | |
| tree | 55f8a0d08d32f3a4beed6c76f9e48db896b8d3bb /arch/x86/boot | |
| parent | e486b4c4ba601410772136ba0f8337bf545dccad (diff) | |
| parent | d50ba3687b99213501463a1947e3dd5b98bc2d99 (diff) | |
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cleanups from Ingo Molnar:
"Misc smaller cleanups"
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/lib: Fix spelling, put space between a numeral and its units
x86/lib: Fix spelling in the comments
x86, quirks: Shut-up a long-standing gcc warning
x86, msr: Unify variable names
x86-64, docs, mm: Add vsyscall range to virtual address space layout
x86: Drop KERNEL_IMAGE_START
x86_64: Use __BOOT_DS instead_of __KERNEL_DS for safety
Diffstat (limited to 'arch/x86/boot')
| -rw-r--r-- | arch/x86/boot/compressed/head_64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S index c1d383d1fb7e..16f24e6dad79 100644 --- a/arch/x86/boot/compressed/head_64.S +++ b/arch/x86/boot/compressed/head_64.S | |||
| @@ -52,7 +52,7 @@ ENTRY(startup_32) | |||
| 52 | jnz 1f | 52 | jnz 1f |
| 53 | 53 | ||
| 54 | cli | 54 | cli |
| 55 | movl $(__KERNEL_DS), %eax | 55 | movl $(__BOOT_DS), %eax |
| 56 | movl %eax, %ds | 56 | movl %eax, %ds |
| 57 | movl %eax, %es | 57 | movl %eax, %es |
| 58 | movl %eax, %ss | 58 | movl %eax, %ss |