[PATCH] arm26: move some files to better locations

This diff effects a restructuring of arm26s directory layout.  A number of
files can now move to more logical locations, since there are no machine
specific directories anymore.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

include/asm-arm26/calls.h → arch/arm26/kernel/calls.S

 /*
- *  linux/arch/arm26/lib/calls.h
+ *  linux/arch/arm26/kernel/calls.S
  *
  *  Copyright (C) 2003 Ian Molton
  *
@@ -8,8 +8,11 @@
  * published by the Free Software Foundation.
  *
  *  FIXME
- *  This file is included twice in entry-common.S which may not be necessary
+ *  This file is included twice in entry.S which may not be necessary
  */
+
+//FIXME - clearly NR_syscalls is never defined here
+
 #ifndef NR_syscalls
 #define NR_syscalls 256
 #else

arch/arm26/machine/head.S → arch/arm26/kernel/head.S

 /*
- *  linux/arch/arm/kernel/head-armo.S
+ *  linux/arch/arm26/kernel/head.S
  *
  *  Copyright (C) 1994-2000 Russell King
  *  Copyright (C) 2003 Ian Molton
@@ -22,10 +22,13 @@
  */
 		.section ".init.text",#alloc,#execinstr
 ENTRY(stext)
-__entry:	cmp	pc, #0x02000000
+
+__entry:
+		cmp	pc, #0x02000000
 		ldrlt	pc, LC0			@ if 0x01800000, call at 0x02080000
 		teq	r0, #0                  @ Check for old calling method
 		blne	oldparams		@ Move page if old
+
 		adr	r0, LC0
 		ldmib	r0, {r2-r5, sp}		@ Setup stack (and fetch other values)
 
@@ -49,7 +52,6 @@ __entry:	cmp	pc, #0x02000000
                cmp     r4, r5
                blt     1b
 #endif
-
 		mov	fp, #0
 		b	start_kernel
 
@@ -69,7 +71,7 @@ arm2_id:	.long	0x41560200  @ ARM2 and 250 dont have a CPUID
 arm250_id:	.long	0x41560250  @ So we create some after probing for them
 		.align
 
-oldparams:	mov	r4, #0x02000000
+oldparams:	mov     r4, #0x02000000
 		add	r3, r4, #0x00080000
 		add	r4, r4, #0x0007c000
 1:		ldmia	r0!, {r5 - r12}

arch/arm26/lib/io-readsl-armv3.S → arch/arm26/lib/io-readsl.S

 /*
- *  linux/arch/arm/lib/io-readsl-armv3.S
+ *  linux/arch/arm26/lib/io-readsl.S
  *
  *  Copyright (C) 1995-2000 Russell King
  *

arch/arm26/lib/io-readsw-armv3.S → arch/arm26/lib/io-readsw.S

 /*
- *  linux/arch/arm/lib/io-readsw-armv3.S
+ *  linux/arch/arm26/lib/io-readsw.S
  *
  *  Copyright (C) 1995-2000 Russell King
  *

arch/arm26/lib/io-writesw-armv3.S → arch/arm26/lib/io-writesw.S

 /*
- *  linux/arch/arm/lib/io-writesw-armv3.S
+ *  linux/arch/arm26/lib/io-writesw.S
  *
  *  Copyright (C) 1995-2000 Russell King
  *

arch/arm26/machine/oldlatches.c → arch/arm26/machine/latches.c

 /*
- *  linux/arch/arm/kernel/oldlatches.c
+ *  linux/arch/arm26/kernel/latches.c
  *
  *  Copyright (C) David Alan Gilbert 1995/1996,2000
  *  Copyright (C) Ian Molton 2003
@@ -46,7 +46,7 @@ void oldlatch_bupdate(unsigned char mask,unsigned char newdata)
 	unsigned long flags;
 
 	BUG_ON(!machine_is_archimedes());
-	
+
 
 	local_irq_save(flags);//FIXME: was local_save_flags
 	latch_b_copy = (latch_b_copy & ~mask) | newdata;

arch/arm26/mm/mm-memc.c → arch/arm26/mm/memc.c

 /*
- *  linux/arch/arm/mm/mm-armo.c
+ *  linux/arch/arm26/mm/memc.c
  *
  *  Copyright (C) 1998-2000 Russell King
  *

arch/arm26/machine/small_page.c → arch/arm26/mm/small_page.c

 /*
- *  linux/arch/arm/mm/small_page.c
+ *  linux/arch/arm26/mm/small_page.c
  *
  *  Copyright (C) 1996  Russell King
  *  Copyright (C) 2003  Ian Molton
@@ -12,6 +12,8 @@
  *   26/01/1996	RMK	Cleaned up various areas to make little more generic
  *   07/02/1999	RMK	Support added for 16K and 32K page sizes
  *			containing 8K blocks
+ *   23/05/2004 IM	Fixed to use struct page->lru (thanks wli)
+ *
  */
 #include <linux/signal.h>
 #include <linux/sched.h>
@@ -36,6 +38,7 @@
  *  granularity than the page size.  This is typically used for the
  *  second level page tables on 32-bit ARMs.
  *
+ * FIXME - this comment is *out of date*
  * Theory:
  *  We "misuse" the Linux memory management system.  We use alloc_page
  *  to allocate a page and then mark it as reserved.  The Linux memory
@@ -86,7 +89,7 @@ static unsigned long __get_small_page(int priority, struct order *order)
 		if (list_empty(&order->queue))
 			goto need_new_page;
 
-		page = list_entry(order->queue.next, struct page, list);
+		page = list_entry(order->queue.next, struct page, lru);
 again:
 #ifdef PEDANTIC
 		if (USED_MAP(page) & ~order->all_used)