aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/io_32.h
Commit message (Collapse)AuthorAge
*-. Merge branches 'x86/acpi', 'x86/asm', 'x86/cpudetect', 'x86/crashdump', ↵Ingo Molnar2009-02-13
|\ \ | | | | | | | | | 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/header-fixes', 'x86/headers' and 'x86/minor-fixes' into x86/core
| | * x86: asm/io.h: unify ioremap prototypesJeremy Fitzhardinge2009-02-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | Impact: unify identical code asm/io_32.h and _64.h have identical prototypes for the ioremap family of functions. The 32-bit header had a more descriptive comment. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| | * x86: asm/io.h: unify virt_to_phys/phys_to_virtJeremy Fitzhardinge2009-02-06
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Impact: unify identical code asm/io_32.h and _64.h has functionally identical definitions for virt_to_phys, phys_to_virt, page_to_phys, and the isa_* variants, so just unify them. The only slightly functional change is using phys_addr_t for the physical address argument and return val. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
* / x86: unify asm/io.h: IO_SPACE_LIMITJeremy Fitzhardinge2009-01-29
|/ | | | | | | | | Impact: Cleanup (trivial unification) Move common define IO_SPACE_LIMIT from <asm/io_*.h> to <asm/io.h>. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* x86: Fix ASM_X86__ header guardsH. Peter Anvin2008-10-23
| | | | | | | | | Change header guards named "ASM_X86__*" to "_ASM_X86_*" since: a. the double underscore is ugly and pointless. b. no leading underscore violates namespace constraints. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* x86, um: ... and asm-x86 moveAl Viro2008-10-23
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: H. Peter Anvin <hpa@zytor.com>