Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e6b83ed authored by David Woodhouse's avatar David Woodhouse Committed by Linus Torvalds
Browse files

Fix header export of videodev2.h, ivtv.h, ivtvfb.h 



The exported copy of videodev2.h contains this line:

	#define #include <sys/time.h>

This is because for some reason it defines __user for itself -- despite
the fact that we remove all instances of __user when exporting headers.
_All_ pointers in userspace are user pointers. Fix it by removing the
unnecessary '#define __user' from the file.

The new headers ivtv.h and ivtvfb.h would have the same problem... if
whoever put them there had actually remembered to add them to the Kbuild
file while he was at it. Fix those too, and export them as was
presumably intended.

Note that includes of <linux/compiler.h> are also stripped by the header
export process, so those don't need to be conditional.

Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
Acked-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 605d9288

include/linux/Kbuild

+2 −0
Original line number Diff line number Diff line
@@ -250,6 +250,8 @@ unifdef-y += isdn.h 
unifdef-y += isdnif.h

unifdef-y += isdn_divertif.h

unifdef-y += isdn_ppp.h

unifdef-y += ivtv.h

unifdef-y += ivtvfb.h

unifdef-y += joystick.h

unifdef-y += kdev_t.h

unifdef-y += kd.h

include/linux/ivtv.h

+1 −5
Original line number Diff line number Diff line
@@ -21,11 +21,7 @@ 
#ifndef __LINUX_IVTV_H__

#define __LINUX_IVTV_H__



#ifdef __KERNEL__

#include <linux/compiler.h> /* need __user */

#else

#define __user

#endif

#include <linux/compiler.h>

#include <linux/types.h>



/* ivtv knows several distinct output modes: MPEG streaming,

include/linux/ivtvfb.h

+1 −5
Original line number Diff line number Diff line
@@ -21,11 +21,7 @@ 
#ifndef __LINUX_IVTVFB_H__

#define __LINUX_IVTVFB_H__



#ifdef __KERNEL__

#include <linux/compiler.h> /* need __user */

#else

#define __user

#endif

#include <linux/compiler.h>

#include <linux/types.h>



/* Framebuffer external API */

include/linux/videodev2.h

+2 −2
Original line number Diff line number Diff line
@@ -55,13 +55,13 @@ 
 */

#ifndef __LINUX_VIDEODEV2_H

#define __LINUX_VIDEODEV2_H



#ifdef __KERNEL__

#include <linux/time.h>     /* need struct timeval */

#include <linux/compiler.h> /* need __user */

#else

#define __user

#include <sys/time.h>

#endif

#include <linux/compiler.h>

#include <linux/ioctl.h>

#include <linux/types.h>