* [patch 1/2] minmax-removal arch/ia64/kernel/unwind.c
@ 2004-09-01 21:24 janitor
2004-09-08 11:07 ` David Mosberger
0 siblings, 1 reply; 2+ messages in thread
From: janitor @ 2004-09-01 21:24 UTC (permalink / raw)
To: linux-ia64
Patch (against 2.6.8.1) removes unnecessary min/max macros and changes
calls to use kernel.h macros instead.
Since I dont have the hardware those patches are not tested.
Best regards
Veeck
Signed-off-by: Michael Veeck <michael.veeck@gmx.net>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
---
linux-2.6.9-rc1-bk7-max/arch/ia64/kernel/unwind.c | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff -puN arch/ia64/kernel/unwind.c~min-max-arch_ia64_kernel_unwind arch/ia64/kernel/unwind.c
--- linux-2.6.9-rc1-bk7/arch/ia64/kernel/unwind.c~min-max-arch_ia64_kernel_unwind 2004-09-01 19:38:20.000000000 +0200
+++ linux-2.6.9-rc1-bk7-max/arch/ia64/kernel/unwind.c 2004-09-01 19:38:20.000000000 +0200
@@ -47,7 +47,6 @@
#include "entry.h"
#include "unwind_i.h"
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
#define p5 5
#define UNW_LOG_CACHE_SIZE 7 /* each unw_script is ~256 bytes in size */
@@ -963,13 +962,13 @@ static inline void
desc_mem_stack_f (unw_word t, unw_word size, struct unw_state_record *sr)
{
set_reg(sr->curr.reg + UNW_REG_PSP, UNW_WHERE_NONE,
- sr->region_start + MIN((int)t, sr->region_len - 1), 16*size);
+ sr->region_start + min_t(int, t, sr->region_len - 1), 16*size);
}
static inline void
desc_mem_stack_v (unw_word t, struct unw_state_record *sr)
{
- sr->curr.reg[UNW_REG_PSP].when = sr->region_start + MIN((int)t, sr->region_len - 1);
+ sr->curr.reg[UNW_REG_PSP].when = sr->region_start + min_t(int, t, sr->region_len - 1);
}
static inline void
@@ -1005,7 +1004,7 @@ desc_reg_when (unsigned char regnum, unw
if (reg->where = UNW_WHERE_NONE)
reg->where = UNW_WHERE_GR_SAVE;
- reg->when = sr->region_start + MIN((int)t, sr->region_len - 1);
+ reg->when = sr->region_start + min_t(int, t, sr->region_len - 1);
}
static inline void
@@ -1073,7 +1072,7 @@ desc_label_state (unw_word label, struct
static inline int
desc_is_active (unsigned char qp, unw_word t, struct unw_state_record *sr)
{
- if (sr->when_target <= sr->region_start + MIN((int)t, sr->region_len - 1))
+ if (sr->when_target <= sr->region_start + min_t(int, t, sr->region_len - 1))
return 0;
if (qp > 0) {
if ((sr->pr_val & (1UL << qp)) = 0)
@@ -1114,7 +1113,7 @@ desc_spill_reg_p (unsigned char qp, unw_
r = sr->curr.reg + decode_abreg(abreg, 0);
r->where = where;
- r->when = sr->region_start + MIN((int)t, sr->region_len - 1);
+ r->when = sr->region_start + min_t(int, t, sr->region_len - 1);
r->val = (ytreg & 0x7f);
}
@@ -1129,7 +1128,7 @@ desc_spill_psprel_p (unsigned char qp, u
r = sr->curr.reg + decode_abreg(abreg, 1);
r->where = UNW_WHERE_PSPREL;
- r->when = sr->region_start + MIN((int)t, sr->region_len - 1);
+ r->when = sr->region_start + min_t(int, t, sr->region_len - 1);
r->val = 0x10 - 4*pspoff;
}
@@ -1144,7 +1143,7 @@ desc_spill_sprel_p (unsigned char qp, un
r = sr->curr.reg + decode_abreg(abreg, 1);
r->where = UNW_WHERE_SPREL;
- r->when = sr->region_start + MIN((int)t, sr->region_len - 1);
+ r->when = sr->region_start + min_t(int, t, sr->region_len - 1);
r->val = 4*spoff;
}
_
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [patch 1/2] minmax-removal arch/ia64/kernel/unwind.c
2004-09-01 21:24 [patch 1/2] minmax-removal arch/ia64/kernel/unwind.c janitor
@ 2004-09-08 11:07 ` David Mosberger
0 siblings, 0 replies; 2+ messages in thread
From: David Mosberger @ 2004-09-08 11:07 UTC (permalink / raw)
To: linux-ia64
Tony,
>>>>> On Wed, 01 Sep 2004 23:24:51 +0200, janitor@sternwelten.at said:
janitor> Patch (against 2.6.8.1) removes unnecessary min/max macros
janitor> and changes calls to use kernel.h macros instead.
I reviewed and tested this patch and approve of it. Please apply.
--david
---
ia64: minmax-removal in arch/ia64/kernel/unwind.c
Patch (against 2.6.8.1) removes unnecessary min/max macros and changes
calls to use kernel.h macros instead.
Signed-off-by: Michael Veeck <michael.veeck@gmx.net>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: David Mosberger-Tang <davidm@hpl.hp.com>
---
linux-2.6.9-rc1-bk7-max/arch/ia64/kernel/unwind.c | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff -puN arch/ia64/kernel/unwind.c~min-max-arch_ia64_kernel_unwind arch/ia64/kernel/unwind.c
--- linux-2.6.9-rc1-bk7/arch/ia64/kernel/unwind.c~min-max-arch_ia64_kernel_unwind 2004-09-01 19:38:20.000000000 +0200
+++ linux-2.6.9-rc1-bk7-max/arch/ia64/kernel/unwind.c 2004-09-01 19:38:20.000000000 +0200
@@ -47,7 +47,6 @@
#include "entry.h"
#include "unwind_i.h"
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
#define p5 5
#define UNW_LOG_CACHE_SIZE 7 /* each unw_script is ~256 bytes in size */
@@ -963,13 +962,13 @@ static inline void
desc_mem_stack_f (unw_word t, unw_word size, struct unw_state_record *sr)
{
set_reg(sr->curr.reg + UNW_REG_PSP, UNW_WHERE_NONE,
- sr->region_start + MIN((int)t, sr->region_len - 1), 16*size);
+ sr->region_start + min_t(int, t, sr->region_len - 1), 16*size);
}
static inline void
desc_mem_stack_v (unw_word t, struct unw_state_record *sr)
{
- sr->curr.reg[UNW_REG_PSP].when = sr->region_start + MIN((int)t, sr->region_len - 1);
+ sr->curr.reg[UNW_REG_PSP].when = sr->region_start + min_t(int, t, sr->region_len - 1);
}
static inline void
@@ -1005,7 +1004,7 @@ desc_reg_when (unsigned char regnum, unw
if (reg->where = UNW_WHERE_NONE)
reg->where = UNW_WHERE_GR_SAVE;
- reg->when = sr->region_start + MIN((int)t, sr->region_len - 1);
+ reg->when = sr->region_start + min_t(int, t, sr->region_len - 1);
}
static inline void
@@ -1073,7 +1072,7 @@ desc_label_state (unw_word label, struct
static inline int
desc_is_active (unsigned char qp, unw_word t, struct unw_state_record *sr)
{
- if (sr->when_target <= sr->region_start + MIN((int)t, sr->region_len - 1))
+ if (sr->when_target <= sr->region_start + min_t(int, t, sr->region_len - 1))
return 0;
if (qp > 0) {
if ((sr->pr_val & (1UL << qp)) = 0)
@@ -1114,7 +1113,7 @@ desc_spill_reg_p (unsigned char qp, unw_
r = sr->curr.reg + decode_abreg(abreg, 0);
r->where = where;
- r->when = sr->region_start + MIN((int)t, sr->region_len - 1);
+ r->when = sr->region_start + min_t(int, t, sr->region_len - 1);
r->val = (ytreg & 0x7f);
}
@@ -1129,7 +1128,7 @@ desc_spill_psprel_p (unsigned char qp, u
r = sr->curr.reg + decode_abreg(abreg, 1);
r->where = UNW_WHERE_PSPREL;
- r->when = sr->region_start + MIN((int)t, sr->region_len - 1);
+ r->when = sr->region_start + min_t(int, t, sr->region_len - 1);
r->val = 0x10 - 4*pspoff;
}
@@ -1144,7 +1143,7 @@ desc_spill_sprel_p (unsigned char qp, un
r = sr->curr.reg + decode_abreg(abreg, 1);
r->where = UNW_WHERE_SPREL;
- r->when = sr->region_start + MIN((int)t, sr->region_len - 1);
+ r->when = sr->region_start + min_t(int, t, sr->region_len - 1);
r->val = 4*spoff;
}
_
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2004-09-08 11:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-09-01 21:24 [patch 1/2] minmax-removal arch/ia64/kernel/unwind.c janitor
2004-09-08 11:07 ` David Mosberger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox