[LV-k25-commit] kernel-2.5/include/asm-vax hardirq.h,1.7,1.8 socket.h,1.4,1.5

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24539

Modified Files:
	hardirq.h socket.h 
Log Message:
Common definition in hardirq.h and socket.h are moved into 
arch-independent header files in 2.6.9


Index: hardirq.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/hardirq.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- hardirq.h	13 Oct 2003 00:40:48 -0000	1.7
+++ hardirq.h	17 Nov 2004 09:25:25 -0000	1.8
@@ -37,19 +37,6 @@
 #define SOFTIRQ_SHIFT	(PREEMPT_SHIFT + PREEMPT_BITS)
 #define HARDIRQ_SHIFT	(SOFTIRQ_SHIFT + SOFTIRQ_BITS)
 
-#define __MASK(x)	((1UL << (x))-1)
-
-#define PREEMPT_MASK	(__MASK(PREEMPT_BITS) << PREEMPT_SHIFT)
-#define HARDIRQ_MASK	(__MASK(HARDIRQ_BITS) << HARDIRQ_SHIFT)
-#define SOFTIRQ_MASK	(__MASK(SOFTIRQ_BITS) << SOFTIRQ_SHIFT)
-
-#define hardirq_count()	(preempt_count() & HARDIRQ_MASK)
-#define softirq_count()	(preempt_count() & SOFTIRQ_MASK)
-#define irq_count()	(preempt_count() & (HARDIRQ_MASK|SOFTIRQ_MASK))
-
-#define PREEMPT_OFFSET	(1UL << PREEMPT_SHIFT)
-#define SOFTIRQ_OFFSET	(1UL << SOFTIRQ_SHIFT)
-#define HARDIRQ_OFFSET	(1UL << HARDIRQ_SHIFT)
 
 /*
  * The hardirq mask has to be large enough to have space
@@ -60,24 +47,10 @@
 # error HARDIRQ_BITS is too low!
 #endif
 
-/*
- * Are we doing bottom half or hardware interrupt processing?
- * Are we in a softirq context? Interrupt context?
- */
-#define in_irq()	hardirq_count()
-#define in_softirq()	softirq_count()
-#define in_interrupt()	irq_count()
-#define in_atomic()	(preempt_count() != 0)
-
-#define hardirq_trylock()	(!in_interrupt())
-#define hardirq_endlock()	do { } while (0)
-
 #define irq_enter()	(preempt_count() += HARDIRQ_OFFSET)
 
 
 /* FIXME: implement irq_exit() properly when we do CONFIG_PREEMPT */
 #define irq_exit()	(preempt_count() -= HARDIRQ_OFFSET)
 
-#define synchronize_irq(irq)	barrier();
-
 #endif /* _ASM_VAX_HARDIRQ_H */

Index: socket.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/socket.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- socket.h	22 Feb 2004 19:44:55 -0000	1.4
+++ socket.h	17 Nov 2004 09:25:25 -0000	1.5
@@ -50,20 +50,4 @@
 
 #define SO_PEERSEC		31
 
-/* Nasty libc5 fixup - bletch */
-#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
-/* Socket types. */
-#define SOCK_STREAM	1		/* stream (connection) socket	*/
-#define SOCK_DGRAM	2		/* datagram (conn.less) socket	*/
-#define SOCK_RAW	3		/* raw socket			*/
-#define SOCK_RDM	4		/* reliably-delivered message	*/
-#define SOCK_SEQPACKET	5		/* sequential packet socket	*/
-#define SOCK_PACKET	10		/* linux specific way of	*/
-					/* getting packets at the dev	*/
-					/* level.  For writing rarp and	*/
-					/* other similar things on the	*/
-					/* user level.			*/
-#define	SOCK_MAX	(SOCK_PACKET+1)
-#endif					
-
 #endif /* _ASM_SOCKET_H */