[pre-2.1.90-3][PATCH] Cleaning up pre-2.1.90-3

Niels Kristian Bech Jensen (nkbj@image.dk)
Sun, 15 Mar 1998 10:27:36 +0100 (CET)

Hi Linus,
This patch cleans up pre-patch-2.1.90-3. This is what it does:

1. Removes unused variable in arch/i386/kernel/process.c
2. Removes unused '#include <linux/config.h>' in drivers/char/rtc.c
3. Adds function prototype for hfs_tolower() in include/linux/hfs_fs.h
4. Removes unused function 'flush_msg()' in ipc/msg.c
5. Fixes mm/page_alloc.c

diff -urN linux-pre-2.1.90-3/arch/i386/kernel/process.c linux/arch/i386/kernel/process.c
--- linux-pre-2.1.90-3/arch/i386/kernel/process.c Sun Mar 15 06:38:46 1998
+++ linux/arch/i386/kernel/process.c Sun Mar 15 08:14:36 1998
@@ -480,7 +480,6 @@
int copy_thread(int nr, unsigned long clone_flags, unsigned long esp,
struct task_struct * p, struct pt_regs * regs)
{
- int i;
struct pt_regs * childregs;

p->tss.tr = _TSS(nr);
diff -urN linux-pre-2.1.90-3/drivers/char/rtc.c linux/drivers/char/rtc.c
--- linux-pre-2.1.90-3/drivers/char/rtc.c Sun Mar 15 06:38:51 1998
+++ linux/drivers/char/rtc.c Sun Mar 15 08:12:21 1998
@@ -48,7 +48,6 @@
* this driver.)
*/

-#include <linux/config.h>
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/miscdevice.h>
diff -urN linux-pre-2.1.90-3/include/linux/hfs_fs.h linux/include/linux/hfs_fs.h
--- linux-pre-2.1.90-3/include/linux/hfs_fs.h Sun Mar 15 06:39:01 1998
+++ linux/include/linux/hfs_fs.h Sun Mar 15 08:13:25 1998
@@ -301,6 +301,7 @@
extern int hfs_mac2eight(char *, const struct hfs_name *);
extern int hfs_mac2alpha(char *, const struct hfs_name *);
extern int hfs_mac2triv(char *, const struct hfs_name *);
+extern void hfs_tolower(unsigned char *, int);

#define HFS_I(X) (&((X)->u.hfs_i))
#define HFS_SB(X) (&((X)->u.hfs_sb))
diff -urN linux-pre-2.1.90-3/ipc/msg.c linux/ipc/msg.c
--- linux-pre-2.1.90-3/ipc/msg.c Sun Mar 15 06:39:04 1998
+++ linux/ipc/msg.c Sun Mar 15 08:13:57 1998
@@ -40,39 +40,6 @@
return;
}

-/*
- * If the send queue is full, try to free any old messages.
- * These are most probably unwanted, since no one has picked them up...
- */
-#define MSG_FLUSH_TIME 10 /* seconds */
-static void flush_msg(struct msqid_ds *msq)
-{
- struct msg *nmsg;
- unsigned long flags;
- int flushed = 0;
-
- save_flags(flags);
- cli();
-
- /* messages were put on the queue in time order */
- while ( (nmsg = msq->msg_first) &&
- ((CURRENT_TIME - nmsg->msg_stime) > MSG_FLUSH_TIME)) {
- msgbytes -= nmsg->msg_ts;
- msghdrs--;
- msq->msg_cbytes -= nmsg->msg_ts;
- msq->msg_qnum--;
- msq->msg_first = nmsg->msg_next;
- ++flushed;
- kfree(nmsg);
- }
-
- if (msq->msg_qnum == 0)
- msq->msg_first = msq->msg_last = NULL;
- restore_flags(flags);
- if (flushed)
- printk(KERN_WARNING "flushed %d old SYSVIPC messages", flushed);
-}
-
static int real_msgsnd (int msqid, struct msgbuf *msgp, size_t msgsz, int msgflg)
{
int id, err;
diff -urN linux-pre-2.1.90-3/mm/page_alloc.c linux/mm/page_alloc.c
--- linux-pre-2.1.90-3/mm/page_alloc.c Sun Mar 8 15:47:58 1998
+++ linux/mm/page_alloc.c Sun Mar 15 08:12:21 1998
@@ -330,9 +330,9 @@
i = (end_mem - PAGE_OFFSET) >> (PAGE_SHIFT+7);
if (i < 48)
i = 48;
- min_free_pages = i;
- free_pages_low = i + (i>>1);
- free_pages_high = i + i;
+ freepages.min = i;
+ freepages.low = i + (i>>1);
+ freepages.high = i + i;
mem_map = (mem_map_t *) LONG_ALIGN(start_mem);
p = mem_map + MAP_NR(end_mem);
start_mem = LONG_ALIGN((unsigned long) p);

--
Med venlig hilsen / Best regards
                                                              nkbj@image.dk
Niels Kristian Bech Jensen                       http://www.image.dk/~nkbj/




-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu