[PATCH] arch/ppc64: Replace custom MIN macro

Tobias Klauser tklauser at nuerscht.ch
Fri Apr 8 00:24:40 EST 2005


>From the kerneljanitors TODO list:
- min/max macros from kernel.h are safe, a lot of handcrafted MIN/MAX are not.

Signed-off-by: Tobias Klauser <tklauser at nuerscht.ch>

diff -urpN linux-2.6.12-rc2.orig/arch/ppc64/kernel/signal.c linux-2.6.12-rc2/arch/ppc64/kernel/signal.c
--- linux-2.6.12-rc2.orig/arch/ppc64/kernel/signal.c	2005-04-07 16:18:30.287667016 +0200
+++ linux-2.6.12-rc2/arch/ppc64/kernel/signal.c	2005-04-07 16:19:14.159997408 +0200
@@ -42,11 +42,7 @@
 
 #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
 
-#ifndef MIN
-#define MIN(a,b) (((a) < (b)) ? (a) : (b))
-#endif
-
-#define GP_REGS_SIZE	MIN(sizeof(elf_gregset_t), sizeof(struct pt_regs))
+#define GP_REGS_SIZE	min(sizeof(elf_gregset_t), sizeof(struct pt_regs))
 #define FP_REGS_SIZE	sizeof(elf_fpregset_t)
 
 #define TRAMP_TRACEBACK	3



More information about the Linuxppc64-dev mailing list