Merge are.twiddle.net:/home/rth/BK/linus-2.5

into are.twiddle.net:/home/rth/BK/axp-2.5

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)

arch/alpha/kernel/pci.c

@@ -62,17 +62,6 @@ quirk_isa_bridge(struct pci_dev *dev)
 	dev->class = PCI_CLASS_BRIDGE_ISA << 8;
 }
 
-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)
 {
@@ -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,

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);