projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
[powerpc.git]
/
include
/
asm-x86_64
/
io.h
diff --git
a/include/asm-x86_64/io.h
b/include/asm-x86_64/io.h
index
cafdfb3
..
70e91fe
100644
(file)
--- a/
include/asm-x86_64/io.h
+++ b/
include/asm-x86_64/io.h
@@
-1,7
+1,6
@@
#ifndef _ASM_IO_H
#define _ASM_IO_H
#ifndef _ASM_IO_H
#define _ASM_IO_H
-#include <linux/config.h>
/*
* This file contains the definitions for the x86 IO instructions
/*
* This file contains the definitions for the x86 IO instructions
@@
-177,7
+176,7
@@
static inline __u16 __readw(const volatile void __iomem *addr)
{
return *(__force volatile __u16 *)addr;
}
{
return *(__force volatile __u16 *)addr;
}
-static inline __u32 __readl(const volatile void __iomem *addr)
+static
__always_
inline __u32 __readl(const volatile void __iomem *addr)
{
return *(__force volatile __u32 *)addr;
}
{
return *(__force volatile __u32 *)addr;
}