From 55c7dbdfc8e7fb6e2cbd11f80a8915a95ab71e72 Mon Sep 17 00:00:00 2001
From: Oliver Schinagl <oliver@schinagl.nl>
Date: Mon, 14 Mar 2011 11:05:41 +0000
Subject: changes needed to make uClinux-2.4.20-uc1 compliant BSP build

---
 uClinux-2.4.20-uc1/fs/Makefile      | 1 -
 uClinux-2.4.20-uc1/kernel/timer.c   | 3 +++
 uClinux-2.4.20-uc1/mmnommu/Makefile | 2 +-
 uClinux-2.4.20-uc1/mmnommu/slab.c   | 6 ++++++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/uClinux-2.4.20-uc1/fs/Makefile b/uClinux-2.4.20-uc1/fs/Makefile
index 6aa67af..2a0c747 100644
--- a/uClinux-2.4.20-uc1/fs/Makefile
+++ b/uClinux-2.4.20-uc1/fs/Makefile
@@ -55,7 +55,6 @@ subdir-$(CONFIG_NTFS_FS)	+= ntfs
 subdir-$(CONFIG_UFS_FS)		+= ufs
 subdir-$(CONFIG_EFS_FS)		+= efs
 subdir-$(CONFIG_JFFS_FS)	+= jffs
-subdir-$(CONFIG_JFFS2_FS)	+= jffs2
 subdir-$(CONFIG_AFFS_FS)	+= affs
 subdir-$(CONFIG_ROMFS_FS)	+= romfs
 subdir-$(CONFIG_QNX4FS_FS)	+= qnx4
diff --git a/uClinux-2.4.20-uc1/kernel/timer.c b/uClinux-2.4.20-uc1/kernel/timer.c
index 1c626d5..43bbd5f 100644
--- a/uClinux-2.4.20-uc1/kernel/timer.c
+++ b/uClinux-2.4.20-uc1/kernel/timer.c
@@ -698,6 +698,9 @@ void timer_bh(void)
 
 void do_timer(struct pt_regs *regs)
 {
+#ifdef CONFIG_BOARD_W90N745
+	CSR_WRITE(TISR,1); /* clear TIF0 */ //mcli 2
+#endif
 	(*(unsigned long *)&jiffies)++;
 #ifndef CONFIG_SMP
 	/* SMP process accounting uses the local APIC timer */
diff --git a/uClinux-2.4.20-uc1/mmnommu/Makefile b/uClinux-2.4.20-uc1/mmnommu/Makefile
index 2764f61..9500fe5 100644
--- a/uClinux-2.4.20-uc1/mmnommu/Makefile
+++ b/uClinux-2.4.20-uc1/mmnommu/Makefile
@@ -11,7 +11,7 @@ O_TARGET := mmnommu.o
 obj-y	 := bootmem.o filemap.o mlock.o mmap.o \
 			mprotect.o mremap.o numa.o \
 			slab.o swapfile.o vmalloc.o vmscan.o memory.o \
-			swap.o oom_kill.o
+			swap.o swap_state.o oom_kill.o
 
 ifdef CONFIG_CONTIGUOUS_PAGE_ALLOC
 obj-y    += page_alloc2.o
diff --git a/uClinux-2.4.20-uc1/mmnommu/slab.c b/uClinux-2.4.20-uc1/mmnommu/slab.c
index 993f8cb..4ce988a 100644
--- a/uClinux-2.4.20-uc1/mmnommu/slab.c
+++ b/uClinux-2.4.20-uc1/mmnommu/slab.c
@@ -1644,8 +1644,14 @@ void kfree (const void *objp)
 {
 	kmem_cache_t *c;
 	unsigned long flags;
+#ifdef CONFIG_BOARD_W90N745
 	struct page *p = virt_to_page(objp);
+#else
+	struct page *p = NULL;
 
+	objp = (const void *)((unsigned long)objp&0x7fffffff);
+	p = virt_to_page(objp);
+#endif	
 	if (!objp)
 		return;
 
-- 
cgit v0.12