patch-2.4.9 linux/include/linux/kernel.h

Next file: linux/include/linux/lvm.h
Previous file: linux/include/linux/jffs.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.8/linux/include/linux/kernel.h linux/include/linux/kernel.h
@@ -45,14 +45,14 @@
 #define FASTCALL(x)	x
 #endif
 
-struct semaphore;
+struct completion;
 
 extern struct notifier_block *panic_notifier_list;
 NORET_TYPE void panic(const char * fmt, ...)
 	__attribute__ ((NORET_AND format (printf, 1, 2)));
 NORET_TYPE void do_exit(long error_code)
 	ATTRIB_NORET;
-NORET_TYPE void up_and_exit(struct semaphore *, long)
+NORET_TYPE void complete_and_exit(struct completion *, long)
 	ATTRIB_NORET;
 extern int abs(int);
 extern unsigned long simple_strtoul(const char *,char **,unsigned int);
@@ -111,6 +111,11 @@
 	((unsigned char *)&addr)[2], \
 	((unsigned char *)&addr)[1], \
 	((unsigned char *)&addr)[0]
+
+#define min(type,x,y) \
+	({ type __x = (x), __y = (y); __x < __y ? __x: __y; })
+#define max(type,x,y) \
+	({ type __x = (x), __y = (y); __x > __y ? __x: __y; })
 
 #endif /* __KERNEL__ */
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)