projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec...
[linux-2.6-microblaze.git]
/
arch
/
x86
/
include
/
asm
/
fixmap.h
diff --git
a/arch/x86/include/asm/fixmap.h
b/arch/x86/include/asm/fixmap.h
index
4d293dc
..
9479a03
100644
(file)
--- a/
arch/x86/include/asm/fixmap.h
+++ b/
arch/x86/include/asm/fixmap.h
@@
-216,8
+216,8
@@
static inline unsigned long virt_to_fix(const unsigned long vaddr)
}
/* Return an pointer with offset calculated */
}
/* Return an pointer with offset calculated */
-static
inline unsigned long __set_fixmap_offset(enum fixed_addresses idx,
-
phys_addr_t phys, pgprot_t flags)
+static
__always_inline unsigned long
+
__set_fixmap_offset(enum fixed_addresses idx,
phys_addr_t phys, pgprot_t flags)
{
__set_fixmap(idx, phys, flags);
return fix_to_virt(idx) + (phys & (PAGE_SIZE - 1));
{
__set_fixmap(idx, phys, flags);
return fix_to_virt(idx) + (phys & (PAGE_SIZE - 1));