Merge bk://are.twiddle.net/axp-2.5

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

5 files changed, 6 insertions, 22 deletions

diff --git a/arch/alpha/kernel/entry.S b/arch/alpha/kernel/entry.S
index 087961d4b8a4..ed89cf2de21b 100644
--- a/arch/alpha/kernel/entry.S
+++ b/arch/alpha/kernel/entry.S
@@ -591,7 +591,6 @@ alpha_switch_to:
  */
 
 	.globl	ret_from_fork
-#if CONFIG_SMP || CONFIG_PREEMPT
 	.align	4
 	.ent	ret_from_fork
 ret_from_fork:
@@ -599,9 +598,6 @@ ret_from_fork:
 	mov	$17, $16
 	jmp	$31, schedule_tail
 .end ret_from_fork
-#else
-ret_from_fork = ret_from_sys_call
-#endif
 
 /*
  * kernel_thread(fn, arg, clone_flags)
diff --git a/arch/alpha/kernel/pci-noop.c b/arch/alpha/kernel/pci-noop.c
index 860875f555e5..b8a7e3ff8ade 100644
--- a/arch/alpha/kernel/pci-noop.c
+++ b/arch/alpha/kernel/pci-noop.c
@@ -48,7 +48,6 @@ asmlinkage long
 sys_pciconfig_iobase(long which, unsigned long bus, unsigned long dfn)
 {
 	struct pci_controller *hose;
-	struct pci_dev *dev;
 
 	/* from hose or from bus.devfn */
 	if (which & IOBASE_FROM_HOSE) {
@@ -106,6 +105,7 @@ sys_pciconfig_write(unsigned long bus, unsigned long dfn,
 void *
 pci_alloc_consistent(struct pci_dev *pdev, size_t size, dma_addr_t *dma_addrp)
 {
+	return NULL;
 }
 void
 pci_free_consistent(struct pci_dev *pdev, size_t size, void *cpu_addr,
@@ -116,6 +116,7 @@ dma_addr_t
 pci_map_single(struct pci_dev *pdev, void *cpu_addr, size_t size,
 	       int direction)
 {
+	return (dma_addr_t) 0;
 }
 void
 pci_unmap_single(struct pci_dev *pdev, dma_addr_t dma_addr, size_t size,
diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c
index 52d4baffa2bc..730583332411 100644
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
@@ -63,17 +63,6 @@ quirk_isa_bridge(struct pci_dev *dev)
 }
 
 static void __init
-quirk_ali_ide_ports(struct pci_dev *dev)
-{
-	if (dev->resource[0].end == 0xffff)
-		dev->resource[0].end = dev->resource[0].start + 7;
-	if (dev->resource[2].end == 0xffff)
-		dev->resource[2].end = dev->resource[2].start + 7;
-	if (dev->resource[3].end == 0xffff)
-		dev->resource[3].end = dev->resource[3].start + 7;
-}
-
-static void __init
 quirk_cypress(struct pci_dev *dev)
 {
 	/* The Notorious Cy82C693 chip.  */
@@ -121,8 +110,6 @@ pcibios_fixup_final(struct pci_dev *dev)
 struct pci_fixup pcibios_fixups[] __initdata = {
 	{ PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82378,
 	  quirk_isa_bridge },
-	{ PCI_FIXUP_HEADER, PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M5229,
-	  quirk_ali_ide_ports },
 	{ PCI_FIXUP_HEADER, PCI_VENDOR_ID_CONTAQ, PCI_DEVICE_ID_CONTAQ_82C693,
 	  quirk_cypress },
 	{ PCI_FIXUP_FINAL,  PCI_ANY_ID,	PCI_ANY_ID,
diff --git a/include/asm-alpha/bitops.h b/include/asm-alpha/bitops.h
index c2013d1d8a3a..14879b4f33b5 100644
--- a/include/asm-alpha/bitops.h
+++ b/include/asm-alpha/bitops.h
@@ -288,7 +288,7 @@ static inline unsigned long __ffs(unsigned long word)
 #else
 	unsigned long bits, qofs, bofs;
 
-	bits = __kernel_cmpbge(word, 0);
+	bits = __kernel_cmpbge(0, word);
 	qofs = ffz_b(bits);
 	bits = __kernel_extbl(word, qofs);
 	bofs = ffz_b(~bits);
diff --git a/include/asm-alpha/thread_info.h b/include/asm-alpha/thread_info.h
index 40d1416a7037..f798b77816c9 100644
--- a/include/asm-alpha/thread_info.h
+++ b/include/asm-alpha/thread_info.h
@@ -34,9 +34,9 @@ struct thread_info {
  */
 #define INIT_THREAD_INFO(tsk)			\
 {						\
-	task:		&tsk,			\
-	exec_domain:	&default_exec_domain,	\
-	addr_limit:	KERNEL_DS,		\
+	.task		= &tsk,			\
+	.exec_domain	= &default_exec_domain,	\
+	.addr_limit	= KERNEL_DS,		\
 	.restart_block = {			\
 		.fn = do_no_restart_syscall,	\
 	},					\