From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Fri, 18 Jul 2008 14:51:19 +0000 (+0100)
Subject: usb-linux.c: #define __user to work around broken Linux headers
X-Git-Tag: xen-3.3.0-rc1~20^2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1f153e0706851b43bb5c2083e531fd7b64b75be1;p=qemu-xen-3.3-testing.git

usb-linux.c: #define __user to work around broken Linux headers

Really we would like to #include <linux/compiler.h> but according
to changelogs in xen-unstable, at least FC6R3 doesn't have it.

This change is identical to xen-unstable
11601:ba7487569374378b398a1b134ea108a6a8209b4b.
---

diff --git a/usb-linux.c b/usb-linux.c
index 7f75598f..5b573f45 100644
--- a/usb-linux.c
+++ b/usb-linux.c
@@ -28,6 +28,9 @@
 #if defined(__linux__)
 #include <dirent.h>
 #include <sys/ioctl.h>
+/* Some versions of usbdevice_fs.h need __user to be defined for them.   */
+/* This may (harmlessly) conflict with a definition in linux/compiler.h. */
+#define __user
 #include <linux/usbdevice_fs.h>
 #include <linux/version.h>
 #include <signal.h>