Commit 8163904e authored by David S. Miller's avatar David S. Miller
Browse files

[SPARC]: Mark SBUS framebuffer ioctls as IGNORE in compat_ioctl.c 



They are handled in a ->compat_ioctl() handler, so it's just noise
when compat_ioctl.c warns which occurs when they are used on non-SBUS
framebuffer devices.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9b539c03

drivers/video/sbuslib.c

+0 −25
Original line number Diff line number Diff line
@@ -190,17 +190,6 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg, 
EXPORT_SYMBOL(sbusfb_ioctl_helper);



#ifdef CONFIG_COMPAT

struct  fbcmap32 {

	int             index;          /* first element (0 origin) */

	int             count;

	u32		red;

	u32		green;

	u32		blue;

};



#define FBIOPUTCMAP32	_IOW('F', 3, struct fbcmap32)

#define FBIOGETCMAP32	_IOW('F', 4, struct fbcmap32)



static int fbiogetputcmap(struct fb_info *info, unsigned int cmd, unsigned long arg)

{

	struct fbcmap32 __user *argp = (void __user *)arg;
@@ -223,20 +212,6 @@ static int fbiogetputcmap(struct fb_info *info, unsigned int cmd, unsigned long 
			(unsigned long)p);

}



struct fbcursor32 {

	short set;		/* what to set, choose from the list above */

	short enable;		/* cursor on/off */

	struct fbcurpos pos;	/* cursor position */

	struct fbcurpos hot;	/* cursor hot spot */

	struct fbcmap32 cmap;	/* color map info */

	struct fbcurpos size;	/* cursor bit map size */

	u32	image;		/* cursor image bits */

	u32	mask;		/* cursor mask bits */

};



#define FBIOSCURSOR32	_IOW('F', 24, struct fbcursor32)

#define FBIOGCURSOR32	_IOW('F', 25, struct fbcursor32)



static int fbiogscursor(struct fb_info *info, unsigned long arg)

{

	struct fbcursor __user *p = compat_alloc_user_space(sizeof(*p));

fs/compat_ioctl.c

+20 −0
Original line number Diff line number Diff line
@@ -115,6 +115,10 @@ 
#include <linux/dvb/video.h>

#include <linux/lp.h>



#ifdef CONFIG_SPARC

#include <asm/fbio.h>

#endif



static int do_ioctl32_pointer(unsigned int fd, unsigned int cmd,

			      unsigned long arg, struct file *f)

{
@@ -3493,6 +3497,22 @@ IGNORE_IOCTL(VFAT_IOCTL_READDIR_SHORT32) 


/* loop */

IGNORE_IOCTL(LOOP_CLR_FD)



#ifdef CONFIG_SPARC

/* Sparc framebuffers, handled in sbusfb_compat_ioctl() */

IGNORE_IOCTL(FBIOGTYPE)

IGNORE_IOCTL(FBIOSATTR)

IGNORE_IOCTL(FBIOGATTR)

IGNORE_IOCTL(FBIOSVIDEO)

IGNORE_IOCTL(FBIOGVIDEO)

IGNORE_IOCTL(FBIOSCURPOS)

IGNORE_IOCTL(FBIOGCURPOS)

IGNORE_IOCTL(FBIOGCURMAX)

IGNORE_IOCTL(FBIOPUTCMAP32)

IGNORE_IOCTL(FBIOGETCMAP32)

IGNORE_IOCTL(FBIOSCURSOR32)

IGNORE_IOCTL(FBIOGCURSOR32)

#endif

};



#define IOCTL_HASHSIZE 256

include/asm-sparc64/fbio.h

+28 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define __LINUX_FBIO_H



#include <linux/compiler.h>

#include <linux/types.h>



/* Constants used for fbio SunOS compatibility */

/* (C) 1996 Miguel de Icaza */
@@ -299,4 +300,31 @@ struct fb_clut32 { 
#define LEO_LD_GBL_MAP         0x01009000

#define LEO_UNK2_MAP           0x0100a000



#ifdef __KERNEL__

struct  fbcmap32 {

	int             index;          /* first element (0 origin) */

	int             count;

	u32		red;

	u32		green;

	u32		blue;

};



#define FBIOPUTCMAP32	_IOW('F', 3, struct fbcmap32)

#define FBIOGETCMAP32	_IOW('F', 4, struct fbcmap32)



struct fbcursor32 {

	short set;		/* what to set, choose from the list above */

	short enable;		/* cursor on/off */

	struct fbcurpos pos;	/* cursor position */

	struct fbcurpos hot;	/* cursor hot spot */

	struct fbcmap32 cmap;	/* color map info */

	struct fbcurpos size;	/* cursor bit map size */

	u32	image;		/* cursor image bits */

	u32	mask;		/* cursor mask bits */

};



#define FBIOSCURSOR32	_IOW('F', 24, struct fbcursor32)

#define FBIOGCURSOR32	_IOW('F', 25, struct fbcursor32)

#endif



#endif /* __LINUX_FBIO_H */