summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--linux/dev/include/asm-i386/segment.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index eab93ea..b028e52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-02 Samuel Thibault <samuel.thibault@ens-lyon.org>
+
+ * linux/dev/include/asm/segment.h (__put_user, __get_user): Add
+ always_inline attribute.
+
2008-06-29 Samuel Thibault <samuel.thibault@ens-lyon.org>
* i386/i386/fpu.c (fpintr): Do not panic if the we receive the
diff --git a/linux/dev/include/asm-i386/segment.h b/linux/dev/include/asm-i386/segment.h
index d3f6d27..c7b3ff5 100644
--- a/linux/dev/include/asm-i386/segment.h
+++ b/linux/dev/include/asm-i386/segment.h
@@ -44,7 +44,7 @@ struct __segment_dummy { unsigned long a[100]; };
#define __sd(x) ((struct __segment_dummy *) (x))
#define __const_sd(x) ((const struct __segment_dummy *) (x))
-static inline void __put_user(unsigned long x, void * y, int size)
+static inline void __attribute__((always_inline)) __put_user(unsigned long x, void * y, int size)
{
switch (size) {
case 1:
@@ -67,7 +67,7 @@ static inline void __put_user(unsigned long x, void * y, int size)
}
}
-static inline unsigned long __get_user(const void * y, int size)
+static inline unsigned long __attribute__((always_inline)) __get_user(const void * y, int size)
{
unsigned long result;