Merge bk://bk.arm.linux.org.uk

into home.transmeta.com:/home/torvalds/v2.5/linux

10 files changed, 41 insertions, 31 deletions

diff --git a/include/asm-arm/arch-clps711x/memory.h b/include/asm-arm/arch-clps711x/memory.h
index dd1ae0acb55e..e40d08e180f6 100644
--- a/include/asm-arm/arch-clps711x/memory.h
+++ b/include/asm-arm/arch-clps711x/memory.h
@@ -153,13 +153,13 @@
 #define NODE_MAX_MEM_SHIFT	24
 #define NODE_MAX_MEM_SIZE	(1<<NODE_MAX_MEM_SHIFT)
 
-#else
-
-#define PFN_TO_NID(pfn)		(0)
-
 #endif /* CONFIG_DISCONTIGMEM */
 
 #endif	/* CONFIG_ARCH_EDB7211 */
 
+#ifndef PFN_TO_NID
+#define PFN_TO_NID(pfn)		(0)
+#endif
+
 #endif
 
diff --git a/include/asm-arm/dma.h b/include/asm-arm/dma.h
index f42a8cf158ca..0dee33c1aad8 100644
--- a/include/asm-arm/dma.h
+++ b/include/asm-arm/dma.h
@@ -74,6 +74,10 @@ extern void enable_dma(dmach_t channel);
  */
 extern void disable_dma(dmach_t channel);
 
+/* Test whether the specified channel has an active DMA transfer
+ */
+extern int dma_channel_active(dmach_t channel);
+
 /* Set the DMA scatter gather list for this channel
  *
  * This should not be called if a DMA channel is enabled,
diff --git a/include/asm-arm/hardware/sa1111.h b/include/asm-arm/hardware/sa1111.h
index bc0933178340..60bcc0869ab8 100644
--- a/include/asm-arm/hardware/sa1111.h
+++ b/include/asm-arm/hardware/sa1111.h
@@ -198,6 +198,12 @@
 #define USB_RESET_PWRSENSELOW	(1 << 6)
 #define USB_RESET_PWRCTRLLOW	(1 << 7)
 
+#define USB_STATUS_IRQHCIRMTWKUP  (1 <<  7)
+#define USB_STATUS_IRQHCIBUFFACC  (1 <<  8)
+#define USB_STATUS_NIRQHCIM       (1 <<  9)
+#define USB_STATUS_NHCIMFCLR      (1 << 10)
+#define USB_STATUS_USBPWRSENSE    (1 << 11)
+
 /*
  * Serial Audio Controller
  *
diff --git a/include/asm-arm/mach/arch.h b/include/asm-arm/mach/arch.h
index 9e15e251e5de..6831e446a50a 100644
--- a/include/asm-arm/mach/arch.h
+++ b/include/asm-arm/mach/arch.h
@@ -19,6 +19,8 @@
 extern void setup_initrd(unsigned int start, unsigned int size);
 extern void setup_ramdisk(int doload, int prompt, int start, unsigned int rd_sz);
 
+struct tag;
+
 struct machine_desc {
 	/*
 	 * Note! The first four elements are used
@@ -41,7 +43,7 @@ struct machine_desc {
 	unsigned int		reserve_lp2 :1;	/* never has lp2	*/
 	unsigned int		soft_reboot :1;	/* soft reboot		*/
 	void			(*fixup)(struct machine_desc *,
-					 struct param_struct *, char **,
+					 struct tag *, char **,
 					 struct meminfo *);
 	void			(*map_io)(void);/* IO mapping function	*/
 	void			(*init_irq)(void);
diff --git a/include/asm-arm/mach/pci.h b/include/asm-arm/mach/pci.h
index 08c459b25aa5..10f0158e6372 100644
--- a/include/asm-arm/mach/pci.h
+++ b/include/asm-arm/mach/pci.h
@@ -12,27 +12,13 @@ struct pci_sys_data;
 struct pci_bus;
 
 struct hw_pci {
-	/* START OF OLD STUFF */
-	/* Initialise the hardware */
-	void		(*init)(void *);
-
-	/* Setup bus resources */
-	void		(*setup_resources)(struct resource **);
-
-	/* IRQ swizzle */
-	u8		(*swizzle)(struct pci_dev *dev, u8 *pin);
-
-	/* IRQ mapping */
-	int		(*map_irq)(struct pci_dev *dev, u8 slot, u8 pin);
-
-	/* END OF OLD STUFF */
-
-	/* NEW STUFF */
 	int		nr_controllers;
 	int		(*setup)(int nr, struct pci_sys_data *);
 	struct pci_bus *(*scan)(int nr, struct pci_sys_data *);
 	void		(*preinit)(void);
 	void		(*postinit)(void);
+	u8		(*swizzle)(struct pci_dev *dev, u8 *pin);
+	int		(*map_irq)(struct pci_dev *dev, u8 slot, u8 pin);
 };
 
 /*
@@ -57,6 +43,11 @@ struct pci_sys_data {
 u8 pci_std_swizzle(struct pci_dev *dev, u8 *pinp);
 
 /*
+ * Call this with your hw_pci struct to initialise the PCI system.
+ */
+void pci_common_init(struct hw_pci *);
+
+/*
  * PCI controllers
  */
 extern int iop310_setup(int nr, struct pci_sys_data *);
@@ -70,7 +61,7 @@ extern void dc21285_postinit(void);
 
 extern int via82c505_setup(int nr, struct pci_sys_data *);
 extern struct pci_bus *via82c505_scan_bus(int nr, struct pci_sys_data *);
-extern void __init via82c505_init(void *sysdata);
+extern void via82c505_init(void *sysdata);
 
 extern int pci_v3_setup(int nr, struct pci_sys_data *);
 extern struct pci_bus *pci_v3_scan_bus(int nr, struct pci_sys_data *);
diff --git a/include/asm-arm/memory.h b/include/asm-arm/memory.h
index 865f1d686a30..57f6b758164a 100644
--- a/include/asm-arm/memory.h
+++ b/include/asm-arm/memory.h
@@ -69,7 +69,7 @@ static inline void *phys_to_virt(unsigned long x)
 
 #define page_to_pfn(page)	(((page) - mem_map) + PHYS_PFN_OFFSET)
 #define pfn_to_page(pfn)	((mem_map + (pfn)) - PHYS_PFN_OFFSET)
-#define pfn_valid(pfn)		((pfn) >= PHYS_PFN_OFFSET && (pfn) < max_mapnr)
+#define pfn_valid(pfn)		((pfn) >= PHYS_PFN_OFFSET && (pfn) < (PHYS_PFN_OFFSET + max_mapnr))
 
 #define virt_to_page(kaddr)	(pfn_to_page(__pa(kaddr) >> PAGE_SHIFT))
 #define virt_addr_valid(kaddr)	((kaddr) >= PAGE_OFFSET && (kaddr) < (unsigned long)high_memory)
diff --git a/include/asm-arm/proc-armv/system.h b/include/asm-arm/proc-armv/system.h
index bc61642284fa..64ccb9c06c6c 100644
--- a/include/asm-arm/proc-armv/system.h
+++ b/include/asm-arm/proc-armv/system.h
@@ -36,7 +36,7 @@
 extern unsigned long cr_no_alignment;	/* defined in entry-armv.S */
 extern unsigned long cr_alignment;	/* defined in entry-armv.S */
 
-#ifdef __ARM_ARCH_4__
+#if __LINUX_ARM_ARCH__ >= 4
 #define vectors_base()	((cr_alignment & CR_V) ? 0xffff0000 : 0)
 #else
 #define vectors_base()	(0)
@@ -192,7 +192,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
 					: "memory");
 			break;
 #endif
-		default: __bad_xchg(ptr, size);
+		default: __bad_xchg(ptr, size), ret = 0;
 	}
 
 	return ret;
diff --git a/include/asm-arm/ptrace.h b/include/asm-arm/ptrace.h
index ae4927937309..0e4482b8c7ab 100644
--- a/include/asm-arm/ptrace.h
+++ b/include/asm-arm/ptrace.h
@@ -1,6 +1,16 @@
 #ifndef __ASM_ARM_PTRACE_H
 #define __ASM_ARM_PTRACE_H
 
+#define PTRACE_GETREGS		12
+#define PTRACE_SETREGS		13
+#define PTRACE_GETFPREGS	14
+#define PTRACE_SETFPREGS	15
+
+#define PTRACE_SETOPTIONS	21
+
+/* options set using PTRACE_SETOPTIONS */
+#define PTRACE_O_TRACESYSGOOD	0x00000001
+
 #include <asm/proc/ptrace.h>
 
 #ifndef __ASSEMBLY__
@@ -11,11 +21,6 @@
 	(pc_pointer((regs)->ARM_pc))
 
 #ifdef __KERNEL__
-#define PTRACE_GETREGS		12
-#define PTRACE_SETREGS		13
-#define PTRACE_GETFPREGS	14
-#define PTRACE_SETFPREGS	15
-
 extern void show_regs(struct pt_regs *);
 
 #define predicate(x)	(x & 0xf0000000)
diff --git a/include/asm-arm/thread_info.h b/include/asm-arm/thread_info.h
index ede2ac4359b1..154a688c170f 100644
--- a/include/asm-arm/thread_info.h
+++ b/include/asm-arm/thread_info.h
@@ -28,7 +28,7 @@ typedef unsigned long mm_segment_t;		/* domain register	*/
  * low level task data that entry.S needs immediate access to.
  */
 struct thread_info {
-	__u32			flags;		/* low level flags */
+	unsigned long		flags;		/* low level flags */
 	__s32			preempt_count;	/* 0 => preemptable, <0 => bug */
 	mm_segment_t		addr_limit;	/* address limit */
 	__u32			cpu;		/* cpu */
diff --git a/include/asm-arm/unistd.h b/include/asm-arm/unistd.h
index efb95cb9fdf1..0079e480e0d3 100644
--- a/include/asm-arm/unistd.h
+++ b/include/asm-arm/unistd.h
@@ -13,6 +13,8 @@
 #ifndef __ASM_ARM_UNISTD_H
 #define __ASM_ARM_UNISTD_H
 
+#include <linux/linkage.h>
+
 #define __NR_SYSCALL_BASE	0x900000
 
 /*