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

Commit 04dd08b4 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Linus Torvalds
Browse files

Consolidate asm/poll.h 



These files are almost all the same.

This patch could be made even simpler if we don't mind POLLREMOVE turning
up in a few architectures that didn't have it previously (which should be
OK as POLLREMOVE is not used anywhere in the current tree).

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 99eaf3c4

include/asm-alpha/poll.h

+1 −25
Original line number Diff line number Diff line 
#ifndef __ALPHA_POLL_H

#define __ALPHA_POLL_H



#define POLLIN		(1 << 0)

#define POLLPRI		(1 << 1)

#define POLLOUT		(1 << 2)

#define POLLERR		(1 << 3)

#define POLLHUP		(1 << 4)

#define POLLNVAL	(1 << 5)

#define POLLRDNORM	(1 << 6)

#define POLLRDBAND	(1 << 7)

#define POLLWRNORM	(1 << 8)

#define POLLWRBAND	(1 << 9)

#define POLLMSG		(1 << 10)

#define POLLREMOVE	(1 << 12)

#define POLLRDHUP       (1 << 13)





struct pollfd {

	int fd;

	short events;

	short revents;

};



#endif
 
#include <asm-generic/poll.h>

include/asm-arm/poll.h

+1 −27
Original line number Diff line number Diff line 
#ifndef __ASMARM_POLL_H

#define __ASMARM_POLL_H



/* These are specified by iBCS2 */

#define POLLIN		0x0001

#define POLLPRI		0x0002

#define POLLOUT		0x0004

#define POLLERR		0x0008

#define POLLHUP		0x0010

#define POLLNVAL	0x0020



/* The rest seem to be more-or-less nonstandard. Check them! */

#define POLLRDNORM	0x0040

#define POLLRDBAND	0x0080

#define POLLWRNORM	0x0100

#define POLLWRBAND	0x0200

#define POLLMSG		0x0400

#define POLLREMOVE	0x1000

#define POLLRDHUP       0x2000



struct pollfd {

	int fd;

	short events;

	short revents;

};



#endif
 
#include <asm-generic/poll.h>

include/asm-arm26/poll.h

+2 −20
Original line number Diff line number Diff line 
#ifndef __ASMARM_POLL_H

#define __ASMARM_POLL_H



/* These are specified by iBCS2 */

#define POLLIN		0x0001

#define POLLPRI		0x0002

#define POLLOUT		0x0004

#define POLLERR		0x0008

#define POLLHUP		0x0010

#define POLLNVAL	0x0020

#include <asm-generic/poll.h>



/* The rest seem to be more-or-less nonstandard. Check them! */

#define POLLRDNORM	0x0040

#define POLLRDBAND	0x0080

#define POLLWRNORM	0x0100

#define POLLWRBAND	0x0200

#define POLLMSG		0x0400

#define POLLRDHUP       0x2000



struct pollfd {

	int fd;

	short events;

	short revents;

};

#undef POLLREMOVE



#endif

include/asm-avr32/poll.h

+1 −27
Original line number Diff line number Diff line 
#ifndef __ASM_AVR32_POLL_H

#define __ASM_AVR32_POLL_H



/* These are specified by iBCS2 */

#define POLLIN		0x0001

#define POLLPRI		0x0002

#define POLLOUT		0x0004

#define POLLERR		0x0008

#define POLLHUP		0x0010

#define POLLNVAL	0x0020



/* The rest seem to be more-or-less nonstandard. Check them! */

#define POLLRDNORM	0x0040

#define POLLRDBAND	0x0080

#define POLLWRNORM	0x0100

#define POLLWRBAND	0x0200

#define POLLMSG		0x0400

#define POLLREMOVE	0x1000

#define POLLRDHUP	0x2000



struct pollfd {

	int fd;

	short events;

	short revents;

};



#endif /* __ASM_AVR32_POLL_H */
 
#include <asm-generic/poll.h>

include/asm-cris/poll.h

+1 −26
Original line number Diff line number Diff line 
#ifndef __ASM_CRIS_POLL_H

#define __ASM_CRIS_POLL_H



/* taken from asm-alpha */



#define POLLIN		1

#define POLLPRI		2

#define POLLOUT		4

#define POLLERR		8

#define POLLHUP		16

#define POLLNVAL	32

#define POLLRDNORM	64

#define POLLRDBAND	128

#define POLLWRNORM	256

#define POLLWRBAND	512

#define POLLMSG		1024

#define POLLREMOVE	4096

#define POLLRDHUP       8192



struct pollfd {

	int fd;

	short events;

	short revents;

};



#endif
 
#include <asm-generic/poll.h>