diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-08 11:14:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-08 11:14:10 -0700 |
| commit | 1faa6ec8ccbde8c4f0237be80473a4294ebf8289 (patch) | |
| tree | 7348fad546bbedddcb83d1282d9815e7e0fd2e15 /arch/x86/include | |
| parent | 79637a41e466bbe7dfe394bac3c9d86a92fd55b1 (diff) | |
| parent | 1389298f7d14f179c2fa4b4b343079bd56082c70 (diff) | |
| download | op-kernel-dev-1faa6ec8ccbde8c4f0237be80473a4294ebf8289.zip op-kernel-dev-1faa6ec8ccbde8c4f0237be80473a4294ebf8289.tar.gz | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, mcheck: Avoid duplicate sysfs links/files for thresholding banks
io-mapping: Fix the address space annotations
x86: Fix the address space annotations of iomap_atomic_prot_pfn()
x86, mm: Fix CONFIG_VMSPLIT_1G and 2G_OPT trampoline
x86, hwmon: Fix unsafe smp_processor_id() in thermal_throttle_add_dev
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/iomap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/iomap.h b/arch/x86/include/asm/iomap.h index f35eb45..c4191b3 100644 --- a/arch/x86/include/asm/iomap.h +++ b/arch/x86/include/asm/iomap.h @@ -26,11 +26,11 @@ #include <asm/pgtable.h> #include <asm/tlbflush.h> -void * +void __iomem * iomap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot); void -iounmap_atomic(void *kvaddr, enum km_type type); +iounmap_atomic(void __iomem *kvaddr, enum km_type type); int iomap_create_wc(resource_size_t base, unsigned long size, pgprot_t *prot); |
