Commit f6581020 authored by Rusty Russell's avatar Rusty Russell Committed by Linus Torvalds

[PATCH] MIPS min/max replacement

(Ralf said to send this straight to you)

Rusty Russell <rusty@rustcorp.com.au>: Trivial MIPS baget patch to remove minmax macros:
  In favour of kernel.h one:
parent 80b8ce43
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
long int vac_memory_upper; long int vac_memory_upper;
#define CACHEABLE_STR(val) ((val) ? "not cached" : "cached") #define CACHEABLE_STR(val) ((val) ? "not cached" : "cached")
#define MIN(a,b) (((a)<(b)) ? (a):(b))
static void __init vac_show(void) static void __init vac_show(void)
{ {
...@@ -102,7 +101,7 @@ static void __init vac_show(void) ...@@ -102,7 +101,7 @@ static void __init vac_show(void)
if (a24_addr >= from && a24_addr < to) if (a24_addr >= from && a24_addr < to)
printk("\ta24 at %08lx (%dMB)\t[vme, A24/%s, %s]\n", printk("\ta24 at %08lx (%dMB)\t[vme, A24/%s, %s]\n",
a24_addr, a24_addr,
MIN((unsigned int)(a24_addr - from)>>20, 32), min((unsigned int)(a24_addr - from)>>20, 32U),
(a24_base & VAC_A24_DATAPATH) ? "user" : (a24_base & VAC_A24_DATAPATH) ? "user" :
((a24_base & VAC_A24_D32_ENABLE) ? ((a24_base & VAC_A24_D32_ENABLE) ?
"D32" : "D16"), "D32" : "D16"),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment