Commit f4358df8 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] procfs: use kernel min/max

From: "Randy.Dunlap" <rddunlap@osdl.org>

From: Michael Veeck <michael.veeck@gmx.net>

Patch (against 2.6.3) removes unnecessary min/max macros and changes calls to
use kernel.h macros instead.
parent ac1a964d
...@@ -37,10 +37,6 @@ static struct file_operations proc_file_operations = { ...@@ -37,10 +37,6 @@ static struct file_operations proc_file_operations = {
.write = proc_file_write, .write = proc_file_write,
}; };
#ifndef MIN
#define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
/* buffer size is one page but our output routines use some slack for overruns */ /* buffer size is one page but our output routines use some slack for overruns */
#define PROC_BLOCK_SIZE (PAGE_SIZE - 1024) #define PROC_BLOCK_SIZE (PAGE_SIZE - 1024)
...@@ -61,7 +57,7 @@ proc_file_read(struct file *file, char __user *buf, size_t nbytes, ...@@ -61,7 +57,7 @@ proc_file_read(struct file *file, char __user *buf, size_t nbytes,
return -ENOMEM; return -ENOMEM;
while ((nbytes > 0) && !eof) { while ((nbytes > 0) && !eof) {
count = MIN(PROC_BLOCK_SIZE, nbytes); count = min_t(ssize_t, PROC_BLOCK_SIZE, nbytes);
start = NULL; start = NULL;
if (dp->get_info) { if (dp->get_info) {
......
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