Merge branch 'x86/irq' into x86/apic

Merge reason:
	Conflicts in arch/x86/kernel/apic/io_apic.c

Resolved Conflicts:
	arch/x86/kernel/apic/io_apic.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/mn10300/lib/usercopy.c b/arch/mn10300/lib/usercopy.c
index a75b203059c1..7826e6c364e7 100644
--- a/arch/mn10300/lib/usercopy.c
+++ b/arch/mn10300/lib/usercopy.c
@@ -62,7 +62,7 @@ do {								\
                 "       .previous"                              \
                 :"=&r"(res), "=r"(count), "=&r"(w)              \
                 :"i"(-EFAULT), "1"(count), "a"(src), "a"(dst)   \
-                :"memory");                                     \
+                : "memory", "cc");                                      \
 } while (0)
 
 long
@@ -109,7 +109,7 @@ do {						\
                 ".previous\n"                   \
                 : "+r"(size), "=&r"(w)          \
                 : "a"(addr), "d"(0)             \
-                : "memory");                    \
+                : "memory", "cc");              \
 } while (0)
 
 unsigned long
@@ -161,6 +161,6 @@ long strnlen_user(const char *s, long n)
                 ".previous\n"
                 :"=d"(res), "=&r"(w)
                 :"0"(0), "a"(s), "r"(n)
-                :"memory");
+                : "memory", "cc");
         return res;
 }