From: Tobias Klauser <tklauser@nuerscht.ch>
Date: Fri, 6 May 2005 02:10:04 +0000 (+1000)
Subject: [PATCH] arch/ppc64: Replace custom MIN macro
X-Git-Tag: v2.6.12-rc4~29
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6741f3a7f9922391cd02b3ca1329e669497dc22f;p=linux-2.6-omap-h63xx.git

[PATCH] arch/ppc64: Replace custom MIN macro

Replace a custom MIN() macro with the min() macro from kernel.h
This patch removes 4 lines of redundant code.

Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/arch/ppc64/kernel/signal.c b/arch/ppc64/kernel/signal.c
index a95a2b49a1d..bf782276984 100644
--- a/arch/ppc64/kernel/signal.c
+++ b/arch/ppc64/kernel/signal.c
@@ -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