Virtualization - Nov 2010 - [PATCH -next] xen: fix header export to userspace

From: Randy Dunlap <randy.dunlap at oracle.com>

scripts/headers_install.pl prevents "__user" from being exported
to userspace headers, so just use compiler.h to make sure that
__user is defined and avoid the error.

unifdef: linux-next-20101112/xx64/usr/include/xen/privcmd.h.tmp: 79: Premature
EOF (#if line 33 depth 1)

Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Cc:	Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Cc:	Konrad Rzeszutek Wilk <konrad.wilk at oracle.com>
Cc:	xen-devel at lists.xensource.com (moderated for non-subscribers)
Cc:	virtualization at lists.osdl.org
Cc:	Tony Finch <dot at dotat.at>
---
 include/xen/privcmd.h |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

--- linux-next-20101112.orig/include/xen/privcmd.h
+++ linux-next-20101112/include/xen/privcmd.h
@@ -34,13 +34,10 @@
 #define __LINUX_PUBLIC_PRIVCMD_H__
 
 #include <linux/types.h>
+#include <linux/compiler.h>
 
 typedef unsigned long xen_pfn_t;
 
-#ifndef __user
-#define __user
-#endif
-
 struct privcmd_hypercall {
 	__u64 op;
 	__u64 arg[5];

On Sat, 13 Nov 2010, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap at oracle.com>
>
> scripts/headers_install.pl prevents "__user" from being exported
> to userspace headers, so just use compiler.h to make sure that
> __user is defined and avoid the error.
>
> unifdef: linux-next-20101112/xx64/usr/include/xen/privcmd.h.tmp: 79:
Premature EOF (#if line 33 depth 1)
I suggest the following slightly more informative message
> scripts/headers_install.pl strips "__user" when exporting headers
to
> userspace and can introduce a syntax error (detected by unifdef) if
> "__user" appears in an unexpected place. Simplify by using
compiler.h to
> make sure that __user is defined and avoid the error.
>
> unifdef: linux-next-20101112/xx64/usr/include/xen/privcmd.h.tmp: 79:
Premature EOF (#if line 33 depth 1)
In any case,

Acked-By:	Tony Finch <dot at dotat.at>

Tony.
-- 
f.anthony.n.finch  <dot at dotat.at>  http://dotat.at/
HUMBER THAMES DOVER WIGHT PORTLAND: NORTH BACKING WEST OR NORTHWEST, 5 TO 7,
DECREASING 4 OR 5, OCCASIONALLY 6 LATER IN HUMBER AND THAMES. MODERATE OR
ROUGH. RAIN THEN FAIR. GOOD.

On 11/13/2010 08:44 AM, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap at oracle.com>
>
> scripts/headers_install.pl prevents "__user" from being exported
> to userspace headers, so just use compiler.h to make sure that
> __user is defined and avoid the error.
>
> unifdef: linux-next-20101112/xx64/usr/include/xen/privcmd.h.tmp: 79:
Premature EOF (#if line 33 depth 1)
Ah, OK, thanks.  I was wondering what the proper fix for this was.  I'll
stick this in my tree.

Thanks,
    J
> Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
> Cc:	Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
> Cc:	Konrad Rzeszutek Wilk <konrad.wilk at oracle.com>
> Cc:	xen-devel at lists.xensource.com (moderated for non-subscribers)
> Cc:	virtualization at lists.osdl.org
> Cc:	Tony Finch <dot at dotat.at>
> ---
>  include/xen/privcmd.h |    5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
>
> --- linux-next-20101112.orig/include/xen/privcmd.h
> +++ linux-next-20101112/include/xen/privcmd.h
> @@ -34,13 +34,10 @@
>  #define __LINUX_PUBLIC_PRIVCMD_H__
>  
>  #include <linux/types.h>
> +#include <linux/compiler.h>
>  
>  typedef unsigned long xen_pfn_t;
>  
> -#ifndef __user
> -#define __user
> -#endif
> -
>  struct privcmd_hypercall {
>  	__u64 op;
>  	__u64 arg[5];