x86: prepare merger of <asm/alternative_{32,64}.h>
authorH. Peter Anvin <hpa@zytor.com>
Wed, 30 Jan 2008 12:30:30 +0000 (13:30 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 30 Jan 2008 12:30:30 +0000 (13:30 +0100)
commit1d8a1f6b51f6b195dfdcf05821be97edede5664a
tree1c14f052b49aa7253135356e7e9716f425f41efc
parent2b8e05b5677d2b4f3cd218ee90a7332715cb262f
x86: prepare merger of <asm/alternative_{32,64}.h>

Prepare for merging <asm/alternative_{32,64}.h> by making the 32- and
64-bit versions textually identical.  This involves:

- removing arbitrary header inclusion differences
- reorganizing the 32-bit version slightly to match the 64-bit version
- using <asm/asm.h> to unify the assembly code
- renaming struct paravirt_patch to struct paravirt_patch_site in the
  64-bit version to match the 32-bit version; there are no references
  to struct paravirt_patch elsewhere in the tree.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
include/asm-x86/alternative_32.h
include/asm-x86/alternative_64.h