# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1063.1.18 -> 1.1063.1.19 # drivers/char/agp/agpgart_be.c 1.41.1.15 -> 1.41.1.16 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/08/26 jgarzik@redhat.com 1.1063.19.8 # [netdrvr] ethtool_ops support in 3c503, 3c505, 3c507 # -------------------------------------------- # 03/08/26 jgarzik@redhat.com 1.1063.19.9 # [netdrvr] ethtool_ops support for 3c515, 3c523, 3c527, and dmfe # -------------------------------------------- # 03/08/26 jgarzik@redhat.com 1.1063.19.10 # [netdrvr pcmcia] ethtool_ops for 3c574, 3c589, aironet4500, axnet # -------------------------------------------- # 03/08/26 jgarzik@redhat.com 1.1063.19.11 # [NET] add SET_ETHTOOL_OPS back-compat hook # -------------------------------------------- # 03/08/26 jgarzik@redhat.com 1.1063.19.12 # [netdrvr pcmcia] use SET_ETHTOOL_OPS in 3c574, 3c589, aironet4500, and axnet # -------------------------------------------- # 03/08/26 jgarzik@redhat.com 1.1063.19.13 # [netdrvr pcmcia] ethtool_ops support for several more pcmcia drivers # # Drivers updated: fmvj18x_cs, ibmtr_cs, netwave_cs, nmclan_cs, # pcnet_cs, ray_cs, wavelan_cs, xirc2ps_cs, xircom_cb. # -------------------------------------------- # 03/08/26 bjorn.helgaas@hp.com 1.1069.1.22 # ia64: Use $(CC), not $(AS), when checking for "hint @pause" support in binutils. # -------------------------------------------- # 03/08/26 adsharma@unix-os.sc.intel.com 1.1069.1.23 # [PATCH] ia64: IA-32 compatibility patch: FP denormal handling # # The following patch makes ia64 compatible with i386 with respect to # siginfo.si_code on FP denormal operands. This is necessary for the correct # emulation of manycat /r/napali/tmp/p7 |bk-applypatch adsharma unix-os.sc.intel.com ia64: # -------------------------------------------- # 03/08/26 arun.sharma@intel.com 1.1069.1.24 # ia64: fix memory leak in sys32_execve path # # The attached patch by Tony Luck fixes a memory leak in the ia32 execve # code path. Please apply to both 2.4 and 2.5. # -------------------------------------------- # 03/08/26 alex.williamson@hp.com 1.1069.1.25 # ia64: Correct NR_CPUS/cpu_online test order in CMC/CPE polling # # Oops, I must have only tested the UP polling on a 2.4 kernel. On # 2.6, I hit the BUG_ON calling cpu_online(1). Simply swapping the # order of the test fixes it. This should be applied for 2.6 and 2.4. # -------------------------------------------- # 03/08/26 jgarzik@redhat.com 1.1063.19.14 # [netdrvr 8139too] minor bits from 2.6 # # Keeping the driver in sync to ease maintenance headaches. # -------------------------------------------- # 03/08/26 jgarzik@redhat.com 1.1063.2.21 # Merge redhat.com:/spare/repo/marcelo-2.4 # into redhat.com:/spare/repo/net-drivers-2.4 # -------------------------------------------- # 03/08/26 srompf@isg.de 1.1063.2.22 # [netdrvr 8139too] use mii_check_media lib function, # instead of homebrew MII bitbanging. # -------------------------------------------- # 03/08/26 hirofumi@mail.parknet.co.jp 1.1063.2.23 # [netdrvr 8139too] lwake unlock fix # -------------------------------------------- # 03/08/26 hirofumi@mail.parknet.co.jp 1.1063.2.24 # [netdrvr 8139too] remove unused RxConfigMask # -------------------------------------------- # 03/08/26 hirofumi@mail.parknet.co.jp 1.1063.2.25 # [netdrvr 8139too] add more h/w revision ids # -------------------------------------------- # 03/08/26 greg@kroah.com 1.1063.2.26 # [netdrvr sis900] don't call pci_find_device from irq context # # I realized that I've had this patch in my tree for a while, and forgot # to send it to you and lkml. The patch below fixes bug number 923: # http://bugme.osdl.org/show_bug.cgi?id=923 # (basically keeps us from calling pci_find_device from interrupt # context.) # # It's been tested by a few people with this device, and they say it works # just fine for them. Please forward it on up the food chain. # -------------------------------------------- # 03/08/26 javier@tudela.mad.ttd.net 1.1063.2.27 # [wireless airo] add support for MIC and latest firmwares # -------------------------------------------- # 03/08/26 jgarzik@redhat.com 1.1063.2.28 # [wireless airo] build fixes # -------------------------------------------- # 03/08/26 bjorn.helgaas@hp.com 1.1080 # Hand merge (acpi_irq_to_vector patch accepted upstream). # -------------------------------------------- # 03/08/26 bjorn.helgaas@hp.com 1.1081 # Merge hp.com:/home/helgaas/linux/ia64-extras # into hp.com:/home/helgaas/linux/linux-ia64-2.4 # -------------------------------------------- # 03/08/27 davem@kernel.bkbits.net 1.1063.20.1 # Merge davem@nuts.ninka.net:/home/davem/src/BK/tg3-2.4 # into kernel.bkbits.net:/home/davem/tg3-2.4 # -------------------------------------------- # 03/08/27 marcelo@logos.cnet 1.1063.21.1 # Fix possible IRQ handling SMP race: Kudos to TeJun Huh # -------------------------------------------- # 03/08/27 marcelo@logos.cnet 1.1063.21.2 # Changed EXTRAVERSION to -pre1 # -------------------------------------------- # 03/08/27 matthewc@cse.unsw.edu.au 1.1069.1.26 # smpboot.c, acpi.c: # ia64: NR_CPUS and number of CPUs # # While building a kernel for our 4-way Lion box, I made the # mistake of setting NR_CPUS to 4. Little did I know that the # Lion ACPI tables always list 8 CPUs (with only the first N # enabled), and so the resulting kernel overflowed the # smp_boot_data.cpu_phys_id array, crashed and burned. # # (Backported from 2.5 by Bjorn Helgaas). # -------------------------------------------- # 03/08/27 marcelo@logos.cnet 1.1063.20.2 # Merge bk://kernel.bkbits.net/davem/tg3-2.4 # into logos.cnet:/home/marcelo/bk/linux-2.4 # -------------------------------------------- # 03/08/27 marcelo@logos.cnet 1.1063.2.29 # Merge bk://kernel.bkbits.net/jgarzik/net-drivers-2.4 # into logos.cnet:/home/marcelo/bk/linux-2.4 # -------------------------------------------- # 03/08/27 jgarzik@redhat.com 1.1063.22.1 # Merge redhat.com:/spare/repo/marcelo-2.4 # into redhat.com:/spare/repo/net-drivers-2.4 # -------------------------------------------- # 03/08/27 shmulik.hen@intel.com 1.1063.22.2 # [list] backport list_for_each_entry_safe macro from 2.6 # -------------------------------------------- # 03/08/27 shmulik.hen@intel.com 1.1063.22.3 # [netdrvr bonding] fix /proc read function # -------------------------------------------- # 03/08/27 shmulik.hen@intel.com 1.1063.22.4 # [netdrvr bonding] use linked list to handle multiple bond devices # -------------------------------------------- # 03/08/27 shmulik.hen@intel.com 1.1063.22.5 # [netdrvr bonding] update credits/version # -------------------------------------------- # 03/08/27 shmulik.hen@intel.com 1.1063.22.6 # [netdrvr bonding] add another ifenslave.c include # -------------------------------------------- # 03/08/27 shmulik.hen@intel.com 1.1063.22.7 # [netdrvr bonding] update slave setting propagation # # Distinguish between modes that use a primary slave from # those that don't, and propagate settings accordingly; Consolidate # change_active opeartions and add reselect_active and find_best # opeartions. # -------------------------------------------- # 03/08/27 shmulik.hen@intel.com 1.1063.22.8 # [netdrvr bonding] Change monitoring function to use new slave setting propagation # -------------------------------------------- # 03/08/27 shmulik.hen@intel.com 1.1063.22.9 # [netdrvr bonding] Modes that don't use primary don't use the new prop. code # -------------------------------------------- # 03/08/27 shmulik.hen@intel.com 1.1063.22.10 # [netdrvr bonding] Decouple promiscuous handling from the multicast mode setting. # -------------------------------------------- # 03/08/27 shmulik.hen@intel.com 1.1063.22.11 # [netdrvr bonding] support for changing HW address and MTU # -------------------------------------------- # 03/08/27 shmulik.hen@intel.com 1.1063.22.12 # [netdrvr bonding] support for changing MAC addr, MTU in ALB/TLB modes # -------------------------------------------- # 03/08/27 shmulik.hen@intel.com 1.1063.22.13 # [netdrvr bonding] Consolidate /proc code, add CHANGENAME handler # -------------------------------------------- # 03/08/27 shmulik.hen@intel.com 1.1063.22.14 # [netdrvr bonding] Enhance netdev notification handling. # # Also, add comment block and bump version. # -------------------------------------------- # 03/08/27 willy@debian.org 1.1063.22.15 # [ethtool] fix ethtool_get_strings counting bug # -------------------------------------------- # 03/08/27 willy@debian.org 1.1063.22.16 # [netdrvr 8139too] ethtool_ops support # -------------------------------------------- # 03/08/27 steiner@sgi.com 1.1069.1.27 # ia64: add support for non-identity mapped kernels # # Attached is a patch that makes arch/ia64/kernel/head.S work on the # SGI SN system. The patch consists mostly of a backport of portions # of the same file from 2.6. # # I tried to minimized differences between the new file & 2.6 as # opposed to minimizing differences between the new file & 2.4.21. # This makes the patch somewhat larger than needed but (I think) is # correct for the long term. # # # The changes add support for non-identity mapped kernels. This patch # does NOT change the kernel load address - it just adds support for the # case where it was loaded into non-identity mapped memory. # -------------------------------------------- # 03/08/27 mort@wildopensource.com 1.1069.1.28 # [PATCH] ia64: max user stack size of main thread configurable via RLIMIT_STACK # # Make the size of the user stack based on the stack rlimit. # The stack hard stack size now defaults to 2GB, but can be increased # with ulimit up to 1/2 of the max mappable space in a region. # For 16k pages, this makes the max stack size 8TB. # -------------------------------------------- # 03/08/27 bjorn.helgaas@hp.com 1.1082 # Hand merge (because hugetlb is in ia64-extras). # -------------------------------------------- # 03/08/27 greg@kroah.com 1.1063.21.3 # Merge kroah.com:/home/linux/BK/bleed-2.4 # into kroah.com:/home/linux/BK/gregkh-2.4 # -------------------------------------------- # 03/08/27 jgarzik@redhat.com 1.1063.12.49 # [TG3]: Remove pci-set-dma-mask casts. # -------------------------------------------- # 03/08/28 rob@osinvestor.com 1.1063.23.1 # [SPARC]: gcc-3.3 compile fixes, part 1. # -------------------------------------------- # 03/08/28 rob@osinvestor.com 1.1063.23.2 # [SPARC]: gcc-3.3 compile fixes, part 2. # -------------------------------------------- # 03/08/28 rob@osinvestor.com 1.1063.23.3 # [SPARC]: gcc-3.3 compile fixes, part 3. # -------------------------------------------- # 03/08/28 xose@wanadoo.es 1.1063.12.50 # [TG3]: More missing PCI ids. # -------------------------------------------- # 03/08/28 paulus@samba.org 1.1063.24.1 # PPC32: Add support for DMA mapping on non-cache-coherent machines. # -------------------------------------------- # 03/08/28 paulus@samba.org 1.1063.24.2 # PPC32: Add the infrastructure to allow for 64-bit PTEs. # # The IBM PPC440 family allow a 36-bit physical address and this will let # us support them. # -------------------------------------------- # 03/08/28 mporter@kernel.crashing.org 1.1063.24.3 # PPC32: Add support for the IBM PPC 440 family of processors. # # This adds support for the 440GP and 440GX, which are the first "Book E" # processors from IBM. This also adds support for the "Ebony" (440GP) and # "Ocotea" (440GX) reference boards. # -------------------------------------------- # 03/08/28 paulus@samba.org 1.1063.24.4 # PPC32: Fix typo in arch/ppc/Makefile # -------------------------------------------- # 03/08/28 stern@rowland.harvard.edu 1.1063.21.4 # [PATCH] USB: Another unusual_devs.h entry update # # This information was provided by Anthony Arkles . # Please apply to both 2.4 and 2.6. # -------------------------------------------- # 03/08/28 bjorn.helgaas@hp.com 1.1069.1.29 # ia64: Clarify ACPI available_cpus handling. # -------------------------------------------- # 03/08/28 abbotti@mev.co.uk 1.1063.21.5 # [PATCH] USB: ftdi_sio - tidy up write bulk callback # # On Tuesday 19 Aug 2003 21:57, Greg KH wrote: # > On Tue, Aug 19, 2003 at 05:14:28PM +0100, Ian Abbott wrote: # > > The attached patch (usb-2.4-ftdi_sio-wbcbfix.patch) reinstates # > > the port->open_count check in the ftdi_write_bulk_callback # > > function, and should be applied after my earlier patch # > > 'usb-2.4-ftdi_sio-wbcleanup.patch'. # > # > So you're just really getting rid of the "serial" pointer check, # > right? That's fine, but can you send me just one patch that does # > this instead? # # The attached patch combines the changes, but apart from a tiny # reduction in code size, it doesn't achieve anything, but doesn't # seem to cause any harm either. # # I'll leave it to your discretion whether or not to apply it. # # As I mentioned previously, leaving the port->open_count check in (to # only schedule a soft interrupt when the port is open) seems to # prevent an oops, but I suppose it just makes the oops less likely # to happen rather than eliminate it entirely. # -------------------------------------------- # 03/08/28 ddstreet@ieee.org 1.1063.21.6 # [PATCH] USB: backport usbfs 'disconnect' # # here is a backport of the usbfs 'disconnect' functionality. The only # difference I know of from the 2.5 code is this doesn't use the kernel # lock. I'm not sure if that is really needed? Anyway it would be great to # finally get this into 2.4... # -------------------------------------------- # 03/08/28 Stefan.Becker@nokia.com 1.1063.21.7 # [PATCH] USB: acm.c update for new devices # # This support is already in 2.6 # -------------------------------------------- # 03/08/28 greg@kroah.com 1.1063.21.8 # [PATCH] USB: fix up a bunch of copyrights that were incorrectly declared. # # It needs to be "Copyright (C)" not "Copyright (c)" according to the lawyers # who know these things... # -------------------------------------------- # 03/08/28 greg@kroah.com 1.1063.25.1 # [PATCH] PCI hotplug: fix up a bunch of copyrights that were incorrectly declared. # # It needs to be "Copyright (C)" not "Copyright (c)" according to the lawyers # who know these things... # -------------------------------------------- # 03/08/28 vmlinuz386@yahoo.com.ar 1.1063.25.2 # [PATCH] PCI Hotplug: fix __FUNCTION__ warnings # # this patch fix the warning: concatenation of string literals with __FUNCTION__ is deprecated # -------------------------------------------- # 03/08/28 elenstev@mesatop.com 1.1063.2.30 # [PATCH] Add 39 Configure.help texts from -ac tree. # # Hi Marcelo, # # This patch cleans up some old information at the top of the # Configure.help file, and adds help tests for the following 39 options. # The help texts originally came from the development kernel, and were # ported to 2.4 form by myself and others. A few help texts containing # copy and paste errors in 2.6 were corrected. # # These help texts were accepted by Alan into his -ac tree. I retained # their position from Alan's Configure.help file to minimize difficulty in # merging for Bernhard R. in maintaining the (p)ac tree when you merge # these into your tree (I hope). # # Please apply this. The patch is made against your current 2.4-bk tree. # # There are a few more of these, but this should be enough for now. # # Thanks, # Steven # # CONFIG_IP6_NF_MATCH_AHESP # CONFIG_IP6_NF_MATCH_RT # CONFIG_IP6_NF_MATCH_OPTS # CONFIG_IP6_NF_MATCH_FRAG # CONFIG_IP6_NF_MATCH_HL # CONFIG_IP6_NF_MATCH_IPV6HEADER # CONFIG_FUSION_MAX_SGE # CONFIG_QDIO # CONFIG_QDIO_PERF_STATS # CONFIG_IEEE1394_OUI_DB # CONFIG_MTD_REDWOOD # CONFIG_MTD_NAND_AUTCPU12 # CONFIG_MTD_NAND_EDB7312 # CONFIG_I2C_KEYWEST # CONFIG_DRM_I830 # CONFIG_HISAX_ENTERNOW_PCI # CONFIG_CPU_ICACHE_DISABLE # CONFIG_CPU_DCACHE_DISABLE # CONFIG_CPU_DCACHE_WRITETHROUGH # CONFIG_CPU_CACHE_ROUND_ROBIN # CONFIG_CPU_BPREDICT_DISABLE # CONFIG_ZBOOT_ROM # CONFIG_ZBOOT_ROM_TEXT # CONFIG_ZBOOT_ROM_BSS # CONFIG_USB_BRLVGER # CONFIG_USB_KBTAB # CONFIG_USB_SERIAL_EDGEPORT_TI # CONFIG_USB_SERIAL_KEYSPAN_MPR # CONFIG_CHECKING # CONFIG_CHASSIS_LCD_LED # CONFIG_GSC # CONFIG_GSC_WAX # CONFIG_GSC_DINO # CONFIG_HPET_TIMER # CONFIG_GART_IOMMU # CONFIG_INIT_DEBUG # CONFIG_IOMMU_DEBUG # CONFIG_IOMMU_LEAK # CONFIG_HVC_CONSOLE # -------------------------------------------- # 03/08/28 marcelo@logos.cnet 1.1063.2.31 # Changed hch contact information # -------------------------------------------- # 03/08/28 marcelo@logos.cnet 1.1063.2.32 # Fix compilation warning in panic.c # -------------------------------------------- # 03/08/28 cw@sgi.com 1.1063.2.33 # [PATCH] Add SGI IOC4 IDE Driver # # Marcelo, # # As discussed here is patch against you BK tree to add the SGI IOC4 IDE # driver will all complaints addressed! # # Documentation/Configure.help | 6 # MAINTAINERS | 5 # drivers/ide/Config.in | 3 # drivers/ide/pci/Makefile | 1 # drivers/ide/pci/sgiioc4.c | 891 +++++++++++++++++++++++++++++++++ # drivers/ide/pci/sgiioc4.h | 177 ++++++ # include/linux/pci_ids.h | 1 # 7 files changed, 1084 insertions(+) # # *Please* apply this :) # # # # This is a BitKeeper generated patch for the following project: # # Project Name: Linux kernel tree # # This patch format is intended for GNU patch command version 2.5 or higher. # # This patch includes the following deltas: # # ChangeSet 1.1085 -> 1.1086 # # drivers/ide/pci/Makefile 1.4 -> 1.5 # # include/linux/pci_ids.h 1.69 -> 1.70 # # MAINTAINERS 1.105 -> 1.106 # # drivers/ide/Config.in 1.35 -> 1.36 # # Documentation/Configure.help 1.181 -> 1.182 # # (new) -> 1.1 drivers/ide/pci/sgiioc4.c # # (new) -> 1.1 drivers/ide/pci/sgiioc4.h # # # # The following is the BitKeeper ChangeSet Log # # -------------------------------------------- # # 03/08/27 cw@tomahawk.engr.sgi.com 1.1086 # # Add IOC4 IDE driver for SGI Altix Systems # # -------------------------------------------- # # # -------------------------------------------- # 03/08/28 greg@kroah.com 1.1063.25.3 # [PATCH] PCI: add PCI_DEVICE() macro to make pci_device_id tables easier to read. # -------------------------------------------- # 03/08/28 greg@kroah.com 1.1063.25.4 # [PATCH] PCI: add PCI_DEVICE_CLASS() macro to match PCI_DEVICE() macro. # -------------------------------------------- # 03/08/28 russell_d_cagle@mindspring.com 1.1063.21.9 # [PATCH] USB: add Garmin iQue support to visor driver # -------------------------------------------- # 03/08/28 bjorn.helgaas@hp.com 1.1069.1.30 # ia64: TRIVIAL: Remove extraneous '`'. # -------------------------------------------- # 03/08/28 jgarzik@redhat.com 1.1063.2.34 # Merge redhat.com:/spare/repo/marcelo-2.4 # into redhat.com:/spare/repo/net-drivers-2.4 # -------------------------------------------- # 03/08/28 greg@kroah.com 1.1063.26.1 # Merge kroah.com:/home/greg/linux/BK/bleed-2.4 # into kroah.com:/home/greg/linux/BK/gregkh-2.4 # -------------------------------------------- # 03/08/28 greg@kroah.com 1.1063.27.1 # Merge kroah.com:/home/greg/linux/BK/bleed-2.4 # into kroah.com:/home/greg/linux/BK/pci-2.4 # -------------------------------------------- # 03/08/28 bjorn.helgaas@hp.com 1.1069.1.31 # ia64: minstate.h: whitespace changes to reduce diffs with 2.5. # -------------------------------------------- # 03/08/28 bjorn.helgaas@hp.com 1.1069.1.32 # ia64: Fix minstate comments. # -------------------------------------------- # 03/08/28 bjorn.helgaas@hp.com 1.1069.1.33 # [PATCH] ia64: fix SAVE_RESET so OS INIT handler works again # # The syscall optimization patches broke the OS INIT handler because # SAVE_RESET was addressing relative to r12, which contains the virtual # address of the stack pointer. Fixed by addressing relative to r2/r3 # instead. # -------------------------------------------- # 03/08/28 tony.luck@intel.com 1.1069.1.34 # ia64: Trim granules correctly in efi_memmap_walk() # # This was a fun one to track down. I was trying to provide # a fake SRAT table so that I could start working on some more # ccNUMA issues on a non-NUMA tiger box, but my kernel kept dying # while running scripts out of /etc/init.d/* # # I found I was getting an MCA while executing an lfetch.excl in # clear_page_tables(), the address that was being fetched was # 0xe0000000000a00e8, which is non-cacheable VGA memory on Tiger. # # Root cause was the "trim" code in efi_memmap_walk() had failed # to trim away all the blocks of memory in the bottom granule when # it had seen the memory hole there, so the kernel had managed to # allocate a page at 0x9c000 as a page table, and when the process # using it ended, the cleanup code prefetched off the end of the # page, and into the VGA memory, causing an MCA. # # The problem is that efi_memmap_walk() repeatedly trims the same # entry, instead of trimming each of the entries in the granule. # -------------------------------------------- # 03/08/28 bjorn.helgaas@hp.com 1.1083 # Merge hp.com:/home/helgaas/linux/to-marcelo-2.4 # into hp.com:/home/helgaas/linux/linux-ia64-2.4 # -------------------------------------------- # 03/08/28 jgarzik@redhat.com 1.1063.28.1 # [scsi] add SCSI opcodes and SAM status codes to scsi/scsi.h # # Added: report luns, read/write 16, read capacity 16, # and the SAM_STAT_xxx set of constants. # -------------------------------------------- # 03/08/29 mporter@kernel.crashing.org 1.1063.24.5 # PPC32: Add support for DMA controllers on PPC 4xx processors. # -------------------------------------------- # 03/08/29 paulus@samba.org 1.1063.24.6 # Merge bk://stop.crashing.org/linux-2.4-kgdb # into samba.org:/stuff/paulus/kernel/for-marcelo-ppc # -------------------------------------------- # 03/08/29 paulus@samba.org 1.1063.29.1 # Merge samba.org:/home/paulus/kernel/linux-2.4 # into samba.org:/home/paulus/kernel/for-marcelo-ppc # -------------------------------------------- # 03/08/29 paulus@samba.org 1.1063.29.2 # PPC32: Use CONFIG_IBM_OPENBIOS instead of CONFIG_TREEBOOT # -------------------------------------------- # 03/08/29 paulus@samba.org 1.1063.29.3 # PPC32: Add support for the PPC970 processor. # -------------------------------------------- # 03/08/29 paulus@samba.org 1.1063.29.4 # PPC32: Minor cleanups and fixes for 4xx/BookE systems # -------------------------------------------- # 03/08/29 paulus@samba.org 1.1063.29.5 # PPC32: Restructure signal code, new ucontext structure, add swapcontext syscall. # # The ucontext struct now corresponds with glibc's new ucontext_t. The old # ucontext didn't actually have room for all the registers, and it had to be # changed to allow setcontext et al. to be implemented. This means that the # stack layout for real-time signal delivery has changed slightly. Existing # applications using the uc_mcontext.regs pointer will still work since the # new uc_regs field is in the same position and points to the start of the # mcontext, where the registers are saved. # # We now save the vector registers on the stack on signal delivery if the process # has ever used any altivec instructions (since the last exec). # # Swapcontext is implemented as a system call because it isn't possible to set # all three of LR, CTR and the instruction pointer to arbitrary values at user # level, and because the kernel knows whether the FP and vector registers are # owned by this process and can optimize in the case that they aren't. With # the swapcontext system call we can implement setcontext, getcontext and # swapcontext. # -------------------------------------------- # 03/08/29 paulus@samba.org 1.1063.29.6 # PPC32: Implement semtimedop system call. # -------------------------------------------- # 03/08/29 masanari.iida@hp.com 1.1063.30.1 # [PATCH] SCSI blacklist HP Va7140 # # As Stefan Schindewolf reported on 25/Aug 2003 on Kernel mailing list, # scsi_scan.c has missing entory and also typo. # Apply this patch on 2.4.23-preX. # # Regards, # # masanari # -------------------------------------------- # 03/08/29 marcelo@logos.cnet 1.1063.30.2 # Delete unused drivers/scsi/aic79xx (now aic7xxx supports it) # # .del-scsi_message.h~702d04df39cec421: # Delete: drivers/scsi/aic79xx/scsi_message.h # .del-scsi_iu.h~19dfb28b403d5076: # Delete: drivers/scsi/aic79xx/scsi_iu.h # .del-queue.h~22333ebc4752ba27: # Delete: drivers/scsi/aic79xx/queue.h # .del-cam.h~142be79aa2e7b6e4: # Delete: drivers/scsi/aic79xx/cam.h # .del-aiclib.h~91a202de5ec07b45: # Delete: drivers/scsi/aic79xx/aiclib.h # .del-aiclib.c~4f9c5e58fe29475f: # Delete: drivers/scsi/aic79xx/aiclib.c # .del-aic79xx_seq.h~f087a47d39ec35d1: # Delete: drivers/scsi/aic79xx/aic79xx_seq.h # .del-aic79xx_reg_print.c~4602f821bb30aa98: # Delete: drivers/scsi/aic79xx/aic79xx_reg_print.c # .del-aic79xx_reg.h~2a5d1aeafe35d774: # Delete: drivers/scsi/aic79xx/aic79xx_reg.h # .del-aic79xx_proc.c~65ba7c0cbcae9e17: # Delete: drivers/scsi/aic79xx/aic79xx_proc.c # .del-aic79xx_pci.c~f3be49004874d74d: # Delete: drivers/scsi/aic79xx/aic79xx_pci.c # .del-aic79xx_osm_pci.c~ce497673678cc8cb: # Delete: drivers/scsi/aic79xx/aic79xx_osm_pci.c # .del-aic79xx_osm.h~a9993aeb34f68385: # Delete: drivers/scsi/aic79xx/aic79xx_osm.h # .del-aic79xx_osm.c~c85edf4627f2d3b8: # Delete: drivers/scsi/aic79xx/aic79xx_osm.c # .del-aic79xx_inline.h~4fe599bddc047da0: # Delete: drivers/scsi/aic79xx/aic79xx_inline.h # .del-aic79xx_core.c~3acdfe0b216b89b2: # Delete: drivers/scsi/aic79xx/aic79xx_core.c # .del-aic79xx.seq~1fc373c5c245fa53: # Delete: drivers/scsi/aic79xx/aic79xx.seq # .del-aic79xx.reg~c7d1afd63bee29d: # Delete: drivers/scsi/aic79xx/aic79xx.reg # .del-aic79xx.h~f52414d5ceae1d0c: # Delete: drivers/scsi/aic79xx/aic79xx.h # .del-Makefile~170d5d2f4fc1242d: # Delete: drivers/scsi/aic79xx/Makefile # .del-Config.in~5417c5049523b240: # Delete: drivers/scsi/aic79xx/Config.in # .del-CHANGELOG~d01c3638ccfa2574: # Delete: drivers/scsi/aic79xx/CHANGELOG # -------------------------------------------- # 03/08/29 bjorn.helgaas@hp.com 1.1069.1.35 # ia64: Remove AIC7XXX driver from ski defconfig. # -------------------------------------------- # 03/08/29 cw@sgi.com 1.1063.30.3 # [PATCH] SGI SN Serial/Console Driver # # Marcelo, # # As discussed here is the serial & console driver required for Altix # systems. # # Documentation/Configure.help | 11 # drivers/char/Config.in | 6 # drivers/char/Makefile | 1 # drivers/char/sn_serial.c | 1190 +++++++++++++++++++++++++++++++++ # drivers/char/tty_io.c | 7 # 5 files changed, 1215 insertions(+) # # # # This is a BitKeeper generated patch for the following project: # # Project Name: Linux kernel tree # # This patch format is intended for GNU patch command version 2.5 or higher. # # This patch includes the following deltas: # # ChangeSet 1.1086 -> 1.1087 # # drivers/char/Config.in 1.50 -> 1.51 # # drivers/char/tty_io.c 1.26 -> 1.27 # # Documentation/Configure.help 1.182 -> 1.183 # # drivers/char/Makefile 1.35 -> 1.36 # # (new) -> 1.2 drivers/char/sn_serial.c # # # # The following is the BitKeeper ChangeSet Log # # -------------------------------------------- # # 03/08/27 cw@tomahawk.engr.sgi.com 1.1087 # # Add SGI l1 Serial/Console Driver # # -------------------------------------------- # # # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.4 # [PATCH] PATCH: remove all the 440gx broken bios stuff # # There is a better way to fix this and the SiS and other bits in the PCI # layer. That fix means this bit can go # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.5 # [PATCH] PATCH: replace the pci router logic with working code # # This is more verbose but actually uses less memory as its all __init # unlike the big table. # # The table also fails because there are controllers that have dependancies # for routing on either additional components (440GX) or version (SiS) which # it could not handle. # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.6 # [PATCH] PATCH: update INDEX for docs # # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.7 # [PATCH] PATCH: wolfson touchscreen docs # # #ra1 # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.8 # [PATCH] PATCH: amd watchdog update # # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.9 # [PATCH] PATCH: update i8xx watchdog # # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.10 # [PATCH] PATCH: improved extra key bounce fix # # -------------------------------------------- # 03/08/30 jgarzik@redhat.com 1.1063.28.2 # Merge redhat.com:/spare/repo/marcelo-2.4 # into redhat.com:/spare/repo/misc-2.4 # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.11 # [PATCH] PATCH: fix a missing rocket card # # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.12 # [PATCH] PATCH: warning fix # # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.13 # [PATCH] PATCH: fix nowayout handling on softdog # # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.14 # [PATCH] PATCH: fix missing formatting info in ide-cd # # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.15 # [PATCH] PATCH: add open/close methods to ide-default for hotplug # # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.16 # [PATCH] PATCH: move sibyte driver into the right dir # # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.17 # [PATCH] PATCH: Add Intel ICH3 hotplug support # # This covers quite a few laptops # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.18 # [PATCH] PATCH: siimage: set a sata flag on the hwif so we can do cable det # # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.19 # [PATCH] PATCH: update ide raid for info pointer changes # # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.20 # [PATCH] PATCH: update ide headers for hotplug # # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.21 # [PATCH] PATCH: fix cable detect issue with sata # # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.22 # [PATCH] PATCH: split ide probe code up # # Lots of probe internals are needed for hotplug too so we split it into # a set of meaningful routines and export the right bits # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.23 # [PATCH] PATCH: Add disk hotplug to the IDE core # # IFF your hardware supports it you can now do # # hdparm -b0 /dev/hda # remove device # replace with different device # hdparm -b1 /dev/hda # # This has been tested a fair bit with thinkpad laptops but not extensively # hammered with other controllers supporting the facility (some HPT/SI cards). # Also note that in general even the hardware supporting it does not support # hotplug in a master/slave setup - that is a hardware limit. # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.24 # [PATCH] PATCH: update cpia driver to fix warnings # # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.25 # [PATCH] PATCH: aacraid update # # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.26 # [PATCH] PATCH: wolfson ac97 touchscreen driver # # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.27 # [PATCH] PATCH: ad1889 error handling fixes # # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.28 # [PATCH] PATCH: ALi5455 update # # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.29 # [PATCH] PATCH: cmpci update # # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.30 # [PATCH] PATCH: fix i810 audio leak # # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.31 # [PATCH] PATCH: makefile/config update for sound changes # # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.32 # [PATCH] PATCH: USB audio fixes for OSS API compliance # # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.33 # [PATCH] PATCH: VGA also works on IA64 # # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.34 # [PATCH] PATCH: tdfxfb updates for 24/32 and big endian # # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.35 # [PATCH] PATCH: allow setuid core dumps # # In some situations you want to get dumps of setuid apps, either because # you administer the system or because you have a secure area to collect # them all (remember core path is configurable too). # # If the admin enables them this patch dumps setuid core files as root # owned files in the nominated location. The default behaviour remains that # users dont get core of setuid files. # # This has been in -ac for a while and is from RH work done at the request # of various large users who collect all their cores in a dump dir # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.36 # [PATCH] PATCH: add sysctl number for setuid core # # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.37 # [PATCH] PATCH: Add headers for wolfson codecs # # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.38 # [PATCH] PATCH: Fix the file sharing/initrd bug # # -------------------------------------------- # 03/08/30 marcelo@logos.cnet 1.1063.30.39 # add sysctl bits for setuid core # -------------------------------------------- # 03/08/30 alan@lxorguk.ukuu.org.uk 1.1063.30.40 # [PATCH] PATCH: resend - mm checks have precedence bugs # # -------------------------------------------- # 03/08/30 marcelo@logos.cnet 1.1063.26.2 # Merge bk://kernel.bkbits.net/gregkh/linux/marcelo-2.4 # into logos.cnet:/home/marcelo/bk/linux-2.4 # -------------------------------------------- # 03/08/30 marcelo@logos.cnet 1.1063.26.3 # Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.4 # into logos.cnet:/home/marcelo/bk/linux-2.4 # -------------------------------------------- # 03/08/30 andrea@suse.de 1.1063.26.4 # [PATCH] vmalloc allocations in ipc needs smp initialized # # Hi Marcelo, # # I submit you this patch for 2.4.23 merging. In short if you change # SEMMNI to 8192 the kernel will crash at boot, beause it tries to call # vmalloc before the smp is initialized. The reason is that vmalloc calls # into the pte alloc code, and the fast pte alloc is tried first, but that # reads into the pte_quicklist, that requires the cpu_data to be # initialized (and that happens in smp_init()). # # the patch is obviously safe, since no piece of kernel (especially the # code in the check_bugs and smp_init paths ;) calls into the ipc # subsystem. # # The reason this started to trigger wasn't really that we increased # SEMMNI, but what happend is that some IPC data structure grown, and for # some reason the corruption due the uninitalized pte_quicklist # triggers only for smp boxes with less than 1G (not very common anymore # ;). So it wasn't immediatly reproducible on all setups. # # 2.6 doesn't suffer from the same problem, simply because 2.6 isn't using # the quicklist anymore, but I think it would be much more correct to make # the same change in 2.6 too, since whatever cond_resched() in the vm # paths (and they're definitely allowed to call it), will lead to a crash # since the init task isn't initialized and the scheduler can't be invoked # yet. (and 2.6 already has the bigger data structures that should trigger # the vmalloc all the time on all setups) # -------------------------------------------- # 03/08/30 thomas@winischhofer.net 1.1063.26.5 # [PATCH] sisfb update # # Marcelo, # # attached is an update for the sis framebuffer driver. As usual, heavily # tested. Reduces source size by about 5000 lines... # # Please apply. # # Thomas # -------------------------------------------- # 03/08/30 marcelo@logos.cnet 1.1063.26.6 # Merge bk://ppc.bkbits.net/for-marcelo-ppc # into logos.cnet:/home/marcelo/bk/linux-2.4 # -------------------------------------------- # 03/08/30 geert@linux-m68k.org 1.1063.26.7 # [PATCH] M68k ptrace # # M68k: Use ptrace_check_attach instead of doing the checks ourselves (from # Andreas Schwab). # -------------------------------------------- # 03/08/30 geert@linux-m68k.org 1.1063.26.8 # [PATCH] Isapnp warning # # Isapnp: Kill warning if CONFIG_PCI is not set, like it's done in 2.6.0. # -------------------------------------------- # 03/08/30 geert@linux-m68k.org 1.1063.26.9 # [PATCH] fb_cmap and transparency # # If a colormap contains no transparency information, fb_set_cmap() calls # fb_setcolreg() with trans = 0. This causes all CLUT entries to be fully # transparent on hardware that does have transparency information in the CLUT # registers. # # The following patch solves this problem by changing the default transparency # from 0 (full transparent) to 0xffff (full opaque). # -------------------------------------------- # 03/08/30 geert@linux-m68k.org 1.1063.26.10 # [PATCH] M68k RTC updates # # M68k: Use genrtc on all m68k platforms # -------------------------------------------- # 03/08/30 geert@linux-m68k.org 1.1063.26.11 # [PATCH] Rename ariadne2 to zorro8390 # # Rename ariadne2 to zorro8390, since this driver supports several NS8390-based # Zorro Ethernet cards. Kill all never used occurrencies of CONFIG_NE2K_ZORRO. # -------------------------------------------- # 03/08/30 geert@linux-m68k.org 1.1063.26.12 # [PATCH] M68k mm cleanup # # M68k: Kill superfluous includes and obsolete commented-out code in mm code. # -------------------------------------------- # 03/08/30 geert@linux-m68k.org 1.1063.26.13 # [PATCH] M68k free_io_area() # # M68k: Take the gap into account in free_io_area() (from Michael Müller) # -------------------------------------------- # 03/08/30 geert@linux-m68k.org 1.1063.26.14 # [PATCH] M68k invalid vs. illegal # # M68k: Use `invalid' instead of `illegal' (from Steven Cole in 2.5.x) # -------------------------------------------- # 03/08/30 geert@linux-m68k.org 1.1063.26.15 # [PATCH] Dmasound invalid vs. illegal # # Dmasound: Use `invalid' instead of `illegal' (from 2.5.x) # -------------------------------------------- # 03/08/30 geert@linux-m68k.org 1.1063.26.16 # [PATCH] M68k cpu_relax() # # M68k: Make cpu_relax() compatible with 2.6. # -------------------------------------------- # 03/08/30 geert@linux-m68k.org 1.1063.26.17 # [PATCH] dmasound SOUND_PCM_READ_RATE # # dmasound: Implement missing SOUND_PCM_READ_RATE ioctl (from Richard Zidlicky) # -------------------------------------------- # 03/08/30 geert@linux-m68k.org 1.1063.26.18 # [PATCH] M68k FPU emulator # # M68k FPU emulator: Add fgetman, fgetexp and fsqrt (from Michael Müller and # Roman Zippel) # -------------------------------------------- # 03/08/30 geert@linux-m68k.org 1.1063.26.19 # [PATCH] dmasound core fixes # # Dmasound core fixes from Christoph Hellwig in 2.6.0: # - Some exported symbols are declared __init - in the modular case this is # freed before the other modules can call it.. # -------------------------------------------- # 03/08/30 mike.miller@hp.com 1.1063.26.20 # [PATCH] cciss multi-path failover in md # # Marcelo, # Here's an updated failover patch created from your BK tree. I downloaded the tree this morning. I'm sorry it took me so long to get back to you. I've been working some HP related issues over the last few days. Please consider this for inclusion. # Patch description: # Enables multi-path failover support in md environments. # Changes: # 1. Sends a no-op command down to the controller and expects it to return in a very short time. # 2. Adds the ability to extend the time in which the command can return. # 3. Monitors the heartbeat register on the controller to cover the special case of a PCI Master Abort. # # Thanks, # mikem # -------------------------------------------- # 03/08/30 geert@linux-m68k.org 1.1063.26.21 # [PATCH] lmc_proto.c includes # # lmc_proto.c includes , causing build failures on UMP-only # architectures # -------------------------------------------- # 03/08/30 geert@linux-m68k.org 1.1063.26.22 # [PATCH] Sonic Ethernet unsafe interrupt # # Sonic Ethernet: Use the interrupt safe version of dev_kfree_skb{_irq} within # the interrupt handler (from Michael Müller) # -------------------------------------------- # 03/08/30 willy@w.ods.org 1.1063.26.23 # [PATCH] Fix log buffer length issues # # On Fri, Aug 29, 2003 at 01:14:19PM -0300, Marcelo Tosatti wrote: # > I'm waiting for your selectable log buffer lengh fixes :) # # OK, Marcelo, here comes my proposed fix. Tom, does it look better for you ? # BTW, Tom, I found the exact reason for the line which irritated you : # #if !defined(CONFIG_LOG_BUF_SHIFT) || (CONFIG_LOG_BUF_SHIFT - 0 == 0) # # it was because because I was worried about CONFIG_LOG_BUG_SHIFT being defined # to the empty string (a simple #define CONFIG_LOG_BUG_SHIFT is enough), as I # remember it happened to me when working on it. But there's no reason here for # this to happen, otherwise we would have far worse problems with values extracted # from .config, so I fixed it. # # I added the config line to all archs. I used copy paste, so either I broke them # all, either none. I'll start a compilation on my alpha while I'm on the way # home, to check. I you have questions, please do ask. # # Cheers, # Willy # -------------------------------------------- # 03/08/30 akpm@osdl.org 1.1063.26.24 # [PATCH] fix possible busywait in rtc_read() # # If two processes are waiting in rtc_read(), only one will get the data. The # other will madly spin around the loop in state TASK_RUNNING until another # interrupt happens. # # Fix it by resetting TASK_INTERRUPTIBLE _inside_ the retry loop. # # # # drivers/char/rtc.c | 4 ++-- # 1 files changed, 2 insertions(+), 2 deletions(-) # -------------------------------------------- # 03/08/30 akpm@osdl.org 1.1063.26.25 # [PATCH] tty oops fix # # Ancient bug, reported by Hiroshi Inoue : # # 1. login to tty2 (not tty1) # 2. start kon (Kanji cONsole emulator, console which support # Japanese characters) # 3. exit kon # 4. logout # # It oopses in the debugging function check_tty_count(), walking a list_head # which has been list_del()'d. Call trace is: # # #0 check_tty_count (tty=0x10d42000, routine=0xc817b00 ".paths") at include/asm/processor.h:583 # #1 0x022c6c00 in do_tty_hangup (data=0x10d42000) at drivers/char/tty_io.c:426 # #2 0x022c6f60 in tty_vhangup (tty=0xc817b00) at drivers/char/tty_io.c:536 # #3 0x022c6fcc in disassociate_ctty (on_exit=1) at drivers/char/tty_io.c:574 # #4 0x02127aee in do_exit (code=0) at kernel/exit.c:718 # #5 0x02127caa in do_group_exit (exit_code=0) at kernel/exit.c:796 # #6 0x02127cbc in sys_exit_group (error_code=0) at kernel/exit.c:807 # # The tty refcount is zero, so everything seems consistent and sensible. The # fix just uses list_del_init() on that list_head. # # # drivers/char/tty_io.c | 4 ++-- # 1 files changed, 2 insertions(+), 2 deletions(-) # -------------------------------------------- # 03/08/30 rddunlap@osdl.org 1.1063.26.26 # [PATCH] add seq_file "single" interfaces # # Hi, # # This patch adds the seq_file "single" interfaces from 2.6.0-test4 # to 2.4.22++. This will enable larger /proc/interrupts and # /proc/mdstat, which currently have some oopsing problems # with large outputs. # # Please apply. # # -- # ~Randy # # # patch_name: seq_single_2423p1.patch # patch_version: 2003-08-25.09:34:59 # author: Randy.Dunlap # description: add seq_file "single" interfaces from 2.6.0-test4 # product: Linux # product_versions: 2422 # diffstat: = # fs/seq_file.c | 90 +++++++++++++++++++++++++++++++++++++++++++++-- # include/linux/seq_file.h | 13 ++++++ # 2 files changed, 100 insertions(+), 3 deletions(-) # -------------------------------------------- # 03/08/30 lethal@linux-sh.org 1.1063.26.27 # [PATCH] Add Paul Mundt to CREDITS # # Here's a quick patch to add myself to CREDITS, please apply. # -------------------------------------------- # 03/08/30 marcelo@logos.cnet 1.1063.26.28 # Merge bk://kernel.bkbits.net/jgarzik/misc-2.4 # into logos.cnet:/home/marcelo/bk/linux-2.4 # -------------------------------------------- # 03/08/30 m.c.p@wolk-project.de 1.1063.26.29 # [PATCH] DRM menu the right fix # # thanks for merging the DRM menu cleanup patch. But now looking at it, let's do # it a different and the most right way. Delete the extra DRM-Config.in file # and move it back to were it was again before the cleanup but with a # mainmenu_option. This looks better and has the same effect, but w/o # introducing another new file. # -------------------------------------------- # 03/08/30 elenstev@mesatop.com 1.1063.26.30 # [PATCH] Add six more Configure.help texts from the -ac tree # # Hi Marcelo, # # Here are another six Configure.help texts which have been sitting in # Alan's tree for a while. Like the others, these texts originated in the # development tree. The order in the -ac tree has be retained for easier # re-merging. # # These six texts appear to be the last which are in the -ac tree and # which are currently needed by mainline 2.4. # # Please apply. This patch was made against your current (this morning) # bk tree. # # Steven # # CONFIG_BLK_DEV_TRIFLEX # CONFIG_BLK_DEV_SC1200 # CONFIG_BLK_DEV_PDC202XX_NEW # CONFIG_MTD_CONCAT # CONFIG_HP_SDC # CONFIG_PDC_CONSOLE # -------------------------------------------- # 03/08/30 marcelo@logos.cnet 1.1063.26.31 # Changed EXTRAVERSION to -pre2 # -------------------------------------------- # 03/08/30 ntfs@flatcap.org 1.1063.26.32 # [PATCH] Fix NTFS build warnings # # Hi Marcelo, # # This patch: # Fixes all NTFS build warnings # Fixes some broken macros (debug build only) # # Gerardo Exequiel Pozzi sent you a patch to fix the NTFS build warnings. # I have tested the patch and fixed a couple of broken macros he missed. # Anton Altaparmakov has given the patch his seal of approval :-) # # Please can you apply the patch to 2.4.22-rc4 # # Cheers, # FlatCap - Richard Russon # ntfs@flatcap.org # -------------------------------------------- # 03/08/30 marcelo@logos.cnet 1.1063.2.35 # Merge bk://kernel.bkbits.net/jgarzik/net-drivers-2.4 # into logos.cnet:/home/marcelo/bk/linux-2.4 # -------------------------------------------- # 03/08/30 akpm@osdl.org 1.1063.2.36 # [PATCH] inodes_stat.nr_inodes race fix # # Small fix to dispose_list() to ensure that inodes_stat.nr_inodes is protected # by inode_lock. # # # # fs/inode.c | 19 +++++++++++-------- # 1 files changed, 11 insertions(+), 8 deletions(-) # -------------------------------------------- # 03/08/30 marcelo@logos.cnet 1.1063.2.37 # Updated my contact information # -------------------------------------------- # 03/08/30 johnstul@us.ibm.com 1.1063.2.38 # [PATCH] Convert /proc/interrupts to use seq_file # # Marcelo, All, # # This patch converts /proc/interrupts to use the seq_file interface on # i386 (thanks to Randy for adding the seq "single" code). This prevents # memory corruption caused by /proc/interrupts overflowing its page sized # buffer on systems with high cpu and interrupt counts. # # Please consider for inclusion. # # thanks # -john # -------------------------------------------- # 03/08/30 jgarzik@redhat.com 1.1063.2.39 # [netdrvr 8139cp] build TX checksumming code, but default OFF # # (previously it was ifdef'd) # # Also, bump version to 1.0. # -------------------------------------------- # 03/08/30 jgarzik@redhat.com 1.1063.2.40 # [netdrvr 8139cp] support NAPI on RX path; Ditch RX frag handling. # # NAPI is turned on unconditionally for the RX path. The hardware # supports interrupt mitigation, so that should be investigated too. # # RX fragment handling removed. We simply ensure that we alloc # buffers large enough to hold incoming packets. Any stray RX # frags that occur (shouldn't be any) will be dropped. # -------------------------------------------- # 03/08/30 jgarzik@redhat.com 1.1063.2.41 # [netdrvr 8139cp] update todo list in header # -------------------------------------------- # 03/08/30 jgarzik@redhat.com 1.1063.2.42 # [netdrvr 8139cp] remove mentions of RTL8169 (now handled by "r8169") # -------------------------------------------- # 03/08/30 jgarzik@redhat.com 1.1063.2.43 # [netdrvr 8139cp] small cleanups # # * remove netif_queue_stopped test, netif_wake_queue already does that # * move vlan stuff to top of file # * remove __dev markers # * update todo list at top of file # * remove pci_set_dma_mask argument casts; ULL suffixes preferred. # -------------------------------------------- # 03/08/30 ink@jurassic.park.msu.ru 1.1063.31.1 # [PCI] update Memory-Write-Invalidate (MWI) transaction support # # Sync up PCI MWI code with 2.5: # - no changes required for drivers or architectures with HAVE_ARCH_PCI_MWI; # - do respect BIOS settings: if the cacheline size is multiple # of that we have expected, assume that this is on purpose; # - assume cacheline size of 32 bytes for all x86s except K7/K8 and P4. # Actually it's good for 386/486s as quite a few PCI devices do not support # smaller values. # # -------------------------------------------- # 03/08/30 jgarzik@redhat.com 1.1063.2.44 # [netdrvr 8139cp] fix NAPI bug; remove board_type distinction, not needed # -------------------------------------------- # 03/08/30 jgarzik@redhat.com 1.1063.2.45 # [netdrvr 8139cp] bump version # -------------------------------------------- # 03/08/30 laforge@netfilter.org 1.1063.32.1 # [NETFILTER]: Fix routing key in ipt_MASQUERADE.c # -------------------------------------------- # 03/08/30 davem@nuts.ninka.net 1.1063.33.1 # Merge nuts.ninka.net:/home/davem/src/BK/sparcwork-2.4 # into nuts.ninka.net:/home/davem/src/BK/sparc-2.4 # -------------------------------------------- # 03/08/31 jgarzik@redhat.com 1.1063.2.46 # [netdrvr 8139cp] stats improvements and fixes # # * make sure rx_frags is still accounted # * query RxMissed register, and clear, upon each get-stats func call # -------------------------------------------- # 03/08/30 davem@nuts.ninka.net 1.1063.33.2 # [SPARC]: Fix uniprocessor build. # -------------------------------------------- # 03/08/30 davem@nuts.ninka.net 1.1063.33.3 # [SPARC64]: In sysv IPC translation, mask out IPC_64 as appropriate. # # Based upon a patch from Keith M Wesolowski # -------------------------------------------- # 03/08/31 jgarzik@redhat.com 1.1063.2.47 # [netdrvr 8139too] make features more persistent; fix PCI DAC mode # # * only set PCIDAC (64-bit PCI) bit in hardware if # sizeof(dma_addr_t) > 32. Need a better test for whether # 64-bit mode is _really_ needed. # * cache chip command register in private struct. this allows # the setting of rx-vlan, rx-csum, and other features to be # persistent across the entire lifetime of the net device. # * remove dead private struct members frag_skb, dropping_frag, # and pci_using_dac. # -------------------------------------------- # 03/08/31 davem@nuts.ninka.net 1.1063.34.1 # Merge nuts.ninka.net:/home/davem/src/BK/tg3-2.4 # into nuts.ninka.net:/disk1/davem/BK/tg3-2.4 # -------------------------------------------- # 03/08/31 marcelo@logos.cnet 1.1063.32.2 # Merge bk://kernel.bkbits.net/davem/net-2.4 # into logos.cnet:/home/marcelo/bk/linux-2.4 # -------------------------------------------- # 03/08/31 jgarzik@redhat.com 1.1063.2.48 # [netdrvr pcmcia] support SIOC[GS]MII{PHY,REG} ioctls # # Updated drivers; 3c574_cs, axnet_cs, pcnet_cs, xirc2ps_cs # # Thanks to Komuro for pointing this out. # -------------------------------------------- # 03/08/31 marcelo@logos.cnet 1.1063.32.3 # Merge bk://kernel.bkbits.net/davem/tg3-2.4 # into logos.cnet:/home/marcelo/bk/linux-2.4 # -------------------------------------------- # 03/08/31 marcelo@logos.cnet 1.1063.31.2 # Merge bk://kernel.bkbits.net/jgarzik/misc-2.4 # into logos.cnet:/home/marcelo/bk/linux-2.4 # -------------------------------------------- # 03/08/31 lethal@linux-sh.org 1.1063.2.49 # [netdrvr 8139too] fix and pci ids needed for SH platform # # a.k.a. Sega Broadband Adapter. # -------------------------------------------- # 03/08/31 jgarzik@redhat.com 1.1063.2.50 # [netdrvr 8139too] remove useless board names # # The only thing that differentiated most of the entries in the # board_info[] table and the board_t type was the vendor branding # string for the board. This table is a pain to maintain, so we # prefer to simply use "RTL8129" or "RTL8139". # -------------------------------------------- # 03/08/31 purna@jcom.home.ne.jp 1.1063.2.51 # [netdrvr] fix skb_padto bugs introduced when skb_padto was introduced # # It seems that skb_padto security fixes in 2.4 and 2.5 trying # to fix "CAN-2003-0001:Multiple ethernet NID device drivers # do not pad frames with null bytes", do not put the skb_padto # blocks in proper places in the 3c527, eth16i, fmv18x, seeq8005, # yellowfin device drivers. # # In case a driver calls skb_padto(), it is possible # that the space available in the original skb buffer tailroom is less # than the space to pad. In this case, in short, the skb_padto() # will create a new skb buffer, copy data from the original # skb buffer to a new skb buffer, free the original buffer, # and finally return the new buffer. # # If this happens to the aforementioned device drivers, they come to # point to wrong data. And, for 3c527 and yellowfin, the drivers can # unexpectedly double free the original skb buffers since they still # point to the original skb buffers. The attached patch against # 2.4.23pre1 fixes these issues. # -------------------------------------------- # 03/08/31 jgarzik@redhat.com 1.1063.31.3 # [ia32] add PCI id for VIA irq router # # Noticed by Sebastian Reichelt. # -------------------------------------------- # 03/08/31 jgarzik@redhat.com 1.1063.31.4 # [PCI] fix export of pdev_set_mwi/pci_generic_prep_mwi # # Missed in recent PCI MWI change. # -------------------------------------------- # 03/08/31 jgarzik@redhat.com 1.1063.31.5 # [BK] ignore auto-generated files lib/{crc32table.h,gen_crc32table} # -------------------------------------------- # 03/08/31 jgarzik@redhat.com 1.1063.2.52 # [netdrvr 8139cp] must call NAPI-specific vlan hook # -------------------------------------------- # 03/08/31 marcelo@logos.cnet 1.1063.35.1 # Change contact information, again. # -------------------------------------------- # 03/08/31 marcelo@logos.cnet 1.1063.36.1 # Merge bk://kernel.bkbits.net/jgarzik/net-drivers-2.4 # into logos.cnet:/home/marcelo/bk/linux-2.4 # -------------------------------------------- # 03/08/31 marcelo@logos.cnet 1.1063.36.2 # Merge bk://kernel.bkbits.net/jgarzik/misc-2.4 # into logos.cnet:/home/marcelo/bk/linux-2.4 # -------------------------------------------- # 03/08/31 hirofumi@mail.parknet.co.jp 1.1063.2.53 # [netdrvr 8139too] remove driver-based poisoning of net_device # # Harmless in 2.4, but causes oopses on rmmod in 2.6. # # slab poisoning can take care of this for us, anyway. # -------------------------------------------- # 03/08/31 hirofumi@mail.parknet.co.jp 1.1063.2.54 # [netdrvr 8139too] don't start thread when it's not needed # # The thread for was unneeded on chips other than CH_8139_K/8129. So, # this patch doesn't create the thread on chips other than # CH_8139_K/8129. # # -------------------------------------------- # 03/08/31 jgarzik@redhat.com 1.1063.2.55 # Merge redhat.com:/spare/repo/marcelo-2.4 # into redhat.com:/spare/repo/net-drivers-2.4 # -------------------------------------------- # 03/08/31 jgarzik@redhat.com 1.1063.2.56 # [netdrvr 8139cp] PCI MWI cleanup; remove unneeded workaround # # * The PCI layer now handles incorrect cacheline size settings, # as it should. Remove our own workarounds. # * Move pci_set_mwi up much earlier in the probe process, # and check its return value. # * Call pci_clear_mwi() in ->probe error handling # * Call pci_clear_mwi() in ->remove # -------------------------------------------- # 03/09/01 xose@wanadoo.es 1.1063.36.3 # [TG3]: ICH2 needs MBOX write reorder bug workaround too. # -------------------------------------------- # 03/09/01 davem@nuts.ninka.net 1.1063.36.4 # [IPV6]: Do not BUG() on icmp6 socket contention, just drop. # -------------------------------------------- # 03/09/01 cw@sgi.com 1.1063.37.1 # [PATCH] Remove kdb hooks from SGI Altix Console driver # # Marcelo, # # Keith does not want KDB distributed outside the main KDB patches. # Please apply this incremental update to the SN serial/console driver. # # # Thanks! # # --cw # -------------------------------------------- # 03/09/01 marcelo@logos.cnet 1.1063.37.2 # Merge http://linux-mh.bkbits.net/fw-loader-2.4 # into logos.cnet:/home/marcelo/bk/linux-2.4 # -------------------------------------------- # 03/09/01 jgarzik@redhat.com 1.1063.2.57 # [netdrvr 8390] new function alloc_ei_netdev() # # (preferred over alloc_etherdev + 8390-specific ethdev_init) # -------------------------------------------- # 03/09/01 jgarzik@redhat.com 1.1063.2.58 # [netdrvr ne2k-pci] allocate netdev+8390 struct using new alloc_ei_netdev() # # Also, call pci_disable_device() in PCI ->remove handler, # to match pci_enable_device() in PCI ->probe handler. # -------------------------------------------- # 03/09/01 jgarzik@redhat.com 1.1063.2.59 # [netdrvr ne2k-pci] sync with 2.5 (100% minor cleanups) # -------------------------------------------- # 03/09/01 javaman@katamail.com 1.1063.37.3 # [PATCH] small config fix for ISDN # # Hi, # # trying to install modules in 2.4.22 I get this error: # depmod: *** Unresolved symbols in /lib/modules/2.4.22/kernel/drivers/isdn/isdn.o # depmod: sk_run_filter # depmod: sk_chk_filter # # this is the fix for drivers/isdn/Config.in, please apply: # -------------------------------------------- # 03/09/01 stelian@popies.net 1.1063.37.4 # [PATCH] reenable CAPTURE button in sonypi # # This attached patch reenables the CAPTURE button events in the sonypi # driver, which were lost with the latest patch... # # The same patch should apply cleanly on both 2.4 and 2.6 kernels. # # Marcelo, Linus, please apply. # # Stelian. # # ===== drivers/char/sonypi.h 1.18 vs edited ===== # -------------------------------------------- # 03/09/01 stelian@popies.net 1.1063.37.5 # [PATCH] meye driver update # # Hi, # # This is a sync with the 2.5 meye driver. Nothing really important here, # just makes it easier for me to maintain both branches. # # Marcelo, please apply. # # Thanks, # # Stelian. # # ===== drivers/media/video/meye.h 1.8 vs edited ===== # -------------------------------------------- # 03/09/01 marcelo@logos.cnet 1.1063.38.1 # Merge bk://kernel.bkbits.net/jgarzik/net-drivers-2.4 # into logos.cnet:/home/marcelo/bk/linux-2.4 # -------------------------------------------- # 03/09/01 jgarzik@redhat.com 1.1063.2.60 # [netdrvr ne2k-pci] ethtool_ops support # -------------------------------------------- # 03/09/01 m.c.p@wolk-project.de 1.1063.38.2 # [PATCH] aty128fb: find the video bios on a Latitude C600 (M3) Inspiron 8000 (M4) # # Hi Marcelo, # # this patch makes aty128fb find the video bios on a Latitude C600 (M3) and # Inspiron 8000 (M4). # # Patch from Andreas Oberritter. # # Anyway, works. Please apply for 2.4.23-pre2. Thanks. # -------------------------------------------- # 03/09/01 jgarzik@redhat.com 1.1063.2.61 # Merge redhat.com:/spare/repo/linux-2.4 # into redhat.com:/spare/repo/net-drivers-2.4 # -------------------------------------------- # 03/09/01 adam@os.inf.tu-dresden.de 1.1063.38.3 # [PATCH] Add kmap_types.h to include/asm-alpha # # A kmap_types.h is needed to compile crypto on alpha. # -------------------------------------------- # 03/09/01 jgarzik@redhat.com 1.1063.2.62 # [NET] move netif_* helpers from tg3 driver to linux/netdevice.h # # Helpers moved: # netif_poll_{enable,disable}, __netif_rx_complete, netif_tx_disable # # Use the helpers in net/core/dev.c. # -------------------------------------------- # 03/09/01 jgarzik@redhat.com 1.1063.2.63 # Merge redhat.com:/spare/repo/linux-2.4 # into redhat.com:/spare/repo/net-drivers-2.4 # -------------------------------------------- # 03/09/01 jgarzik@redhat.com 1.1063.2.64 # [NET] s/blog_dev/backlog_dev/ in process_backlog, net/core/dev.c # # This 100% cosmetic change reduces the diff between 2.4 and 2.5. # -------------------------------------------- # 03/09/01 cw@sgi.com 1.1063.38.4 # [PATCH] SGI fetchop driver # # Marcelo, # # As discussed here is an updated version of the SGI SN fetchop (AMO) # driver for inclusion: # # Config.in | 4 # Makefile | 3 # fetchop.c | 516 ++++++++++++++++++++++++++++++++++++++++++++++++++++ # 3 files changed, 522 insertions(+), 1 deletion(-) # # # # This is a BitKeeper generated patch for the following project: # # Project Name: Linux kernel tree # # This patch format is intended for GNU patch command version 2.5 or higher. # # This patch includes the following deltas: # # ChangeSet 1.1087 -> 1.1088 # # drivers/char/Config.in 1.51 -> 1.52 # # drivers/char/Makefile 1.36 -> 1.37 # # (new) -> 1.1 drivers/char/fetchop.c # # # # The following is the BitKeeper ChangeSet Log # # -------------------------------------------- # # 03/08/27 cw@tomahawk.engr.sgi.com 1.1088 # # Add SGI fetchop driver # # -------------------------------------------- # # # -------------------------------------------- # 03/09/01 m.c.p@wolk-project.de 1.1063.38.5 # [PATCH] Update DRI/DRM so XFree v4.3.0 and above works # # Hi Marcelo, # # # Patch information: # # ------------------ # - Update XFree DRM code to recent code from 2.4.22-rc2-ac3 # - DRI now works with XFree v4.3.0 # - ATI IGP chipset support added incl. pci ids, AGP support # - Initial VIA CLE266 and S3 Savage DRM modules merges from VIA # (These are marked up with some warnings and need a chunk of clean up work) # - enabled 3dlabs GMX 2000 config option # # All compiles cleanly. r128 (ati rage 128) at least works perfectly with XFree # v4.3.0. I have such a card :) # # Please apply for 2.4.23-pre2. Imho Alan said, it needs some cleanups but I # think, Mikael too, that the cleanup should be made once it's in. # -------------------------------------------- # 03/09/01 m.c.p@wolk-project.de 1.1063.38.6 # [PATCH] Disable alpha S3 Savage/VIACLE266 DRM support # # On Thursday 28 August 2003 00:21, Alan Cox wrote: # # Hi Alan, # # > My preference would be to leave the VIA and S3 modules out for the # > moment and wait until the XFree DRI folks have the stuff working nicely. # > Its in -ac because I'm hacking on it not because it works, is ready. # > Or I guess you could just zap the config.in for them ? # # ok with me. Attached a patch ontop of the previous sent update. # -------------------------------------------- # 03/09/01 jgarzik@redhat.com 1.1063.2.65 # [netdrvr] ethtool_ops for epic100, fealnx, winbond-840, via-rhine # -------------------------------------------- # 03/09/01 jgarzik@redhat.com 1.1063.2.66 # [netdrvr] sync with 2.5: epic100, fealnx, via-rhine, winbond-840 # # Minor cleanups and fixes: # * whitespace # * remove __devinitdata # * irqreturn_t and pci_name() changes # * set_bit removal (a fix) # * C99 initializers # -------------------------------------------- # 03/09/01 marcelo@logos.cnet 1.1063.38.7 # Merge bk://kernel.bkbits.net/davem/net-2.4 # into logos.cnet:/home/marcelo/bk/linux-2.4 # -------------------------------------------- # 03/09/01 jgarzik@redhat.com 1.1063.2.67 # [NET] move ethtool_op_set_tx_csum from 8139cp drvr to net/core/ethtool.c, # where it belongs. # -------------------------------------------- # 03/09/01 jgarzik@redhat.com 1.1063.38.8 # [PCI, ia32] don't assume "c->x86 > 6" applies to non-Intel CPUs # when programming PCI cache line size. # # Just to be on the safe side. Suggested by Ingo Oeser. # -------------------------------------------- # 03/09/02 agruen@suse.de 1.1063.38.9 # [PATCH] fix setxattr const-ness # # Hello Marcelo, # # this is a fix I've already sent you earlier. It fixes the declaration of # the value parameter of the setxattr inode operation, which is supposed # to be const---it's a trivial bug. Please apply. # # # # Index: linux-2.4.23-pre2/fs/jfs/jfs_xattr.h # =================================================================== # -------------------------------------------- # 03/09/02 khc@pm.waw.pl 1.1063.38.10 # [PATCH] generic HDLC update # # Marcelo Tosatti writes: # # > Krzysztof, please send me a mail with "generic HDLC update" subject and # > detailed changelog in the body, followed by the patch. (thats easier for # > me to apply :)) # # As you wish: # Looks like I lied - the DCD (carrier detect) isn't here as it needs more # testing - it's in 2.6 only. # # Changes: # * Documentation and spelling fixes # * user can query PVC device for type and DLCI # * private Frame Relay helper routines moved out of hdlc.h # * added hdlc_type_trans() to simplify packet receive path and make tcpdump # etc. happy # * missing rtnl_lock()/rtnl_unload() bug in unregister_hdlc_device fixed # * N2, C101: interrupt handler now works under high IRQ load from other # devices (with previous versions, the IRQ processing for the card could # sometimes stop after reaching "work limit") # * Added Ethernet device emulation for raw HDLC. VLAN and bridging compatible, # tested with RAD ChipBridge (ChipBridge doesn't work with full size VLAN # frames, though). # * Added Ethernet device emulation for bridged Ethernet frames on Frame-Relay. # * no more "protocol 0008 is buggy" while using tcpdump, at last. # * Frame-Relay DCE (network) side now sorts DLCI list in PVC FULL STATUS. # Some FR DTE had problems with unsorted list. # * Small changes to LMI logic with Frame-Relay. # * raw HDLC now defaults to ITU-T 16-bit CRC. # * fix for SCA-II based cards (drivers not in standard kernel) interrupt # setting when using 2 ports. # * there is now one detect_ram routine for all SCA-based cards. # * hw drivers have now smaller TX packet rings to decrease TX latency for # high priority packets (LMI etc) # * fixed subtle transmit bug in c101.c which could lead to transmitter hangs # and duplicated frames with SCA HD64570 working in 8-bit mode. # * kmalloc(GFP_KERNEL) in interrupt context has been fixed. # * Some __init etc fixes. # * other misc fixes # # -- # Krzysztof Halasa, B*FH # -------------------------------------------- # 03/09/02 bunk@fs.tum.de 1.1063.38.11 # [PATCH] Fix IRQ_NONE clash in SCSI drivers # # On Wed, Aug 27, 2003 at 02:52:45PM -0300, Marcelo Tosatti wrote: # >... # > Summary of changes from v2.4.22 to v2.4.23-pre1 # > ============================================ # >... # > Arnaldo Carvalho de Melo: # > o irqreturn_t compatibility with 2.6 # >... # # This change added an (empty) IRQ_NONE #define to interrupt.h. # # Several scsi drivers are already using an IRQ_NONE. Rename that to # SCSI_IRQ_NONE (a similar change was done in 2.5 by Andrew Morton several # months ago). # # I've tested the compilation with 2.4.23-pre2. # # Please apply # Adrian # -------------------------------------------- # 03/09/02 davem@nuts.ninka.net 1.1063.39.1 # [IPV4]: Do not BUG() on icmp_xmit_lock() contention, just drop. # -------------------------------------------- # 03/09/02 davem@kernel.bkbits.net 1.1063.38.12 # Merge nuts.ninka.net:/disk1/davem/BK/net-2.4 # into kernel.bkbits.net:/home/davem/net-2.4 # -------------------------------------------- # 03/09/02 bjorn.helgaas@hp.com 1.1063.1.19 # AGPGART: ia64: Rework for ACPI update and add HWP0007 support. # -------------------------------------------- # diff -Nru a/drivers/char/agp/agpgart_be.c b/drivers/char/agp/agpgart_be.c --- a/drivers/char/agp/agpgart_be.c Wed Oct 8 09:06:20 2003 +++ b/drivers/char/agp/agpgart_be.c Wed Oct 8 09:06:20 2003 @@ -4907,6 +4907,8 @@ #define HP_ZX1_IOVA_TO_PDIR(va) ((va - hp_private.iova_base) >> \ hp_private.io_tlb_shift) +static int hp_zx1_gart_found; + static aper_size_info_fixed hp_zx1_sizes[] = { {0, 0, 0}, /* filled in by hp_zx1_fetch_size() */ @@ -5228,39 +5230,40 @@ return hp_zx1_ioc_init(ioc_hpa, lba_hpa); } -static int __init acpi_hp_zx1_gart_add(struct acpi_device *device) +static acpi_status __init hp_zx1_gart_probe(acpi_handle obj, u32 depth, void *context, void **ret) { acpi_handle handle, parent; acpi_status status; struct acpi_buffer buffer; struct acpi_device_info *info; u64 lba_hpa, sba_hpa, length; + int match; - status = acpi_hp_csr_space(device->handle, &lba_hpa, &length); + status = acpi_hp_csr_space(obj, &lba_hpa, &length); if (ACPI_FAILURE(status)) - return 1; + return AE_OK; /* Look for an enclosing IOC scope and find its CSR space */ - handle = device->handle; + handle = obj; do { buffer.length = ACPI_ALLOCATE_LOCAL_BUFFER; - status = acpi_get_object_info(handle, &info); + status = acpi_get_object_info(handle, &buffer); if (ACPI_SUCCESS(status)) { /* TBD check _CID also */ info = buffer.pointer; - info->hardware_id.value[sizeof(info->hardware_id.value)-1] = '\0'; - if (!strcmp(info->hardware_id.value, "HWP0001")) { - status = acpi_hp_csr_space(handle, &sba_hpa, - &length); + info->hardware_id.value[sizeof(info->hardware_id)-1] = '\0'; + match = (strcmp(info->hardware_id.value, "HWP0001") == 0); + ACPI_MEM_FREE(info); + if (match) { + status = acpi_hp_csr_space(handle, &sba_hpa, &length); if (ACPI_SUCCESS(status)) break; else { printk(KERN_ERR PFX "Detected HP ZX1 " - "AGP LBA but no IOC.\n"); - return 1; + "AGP LBA but no IOC.\n"); + return AE_OK; } } - ACPI_MEM_FREE(info); } status = acpi_get_parent(handle, &parent); @@ -5268,16 +5271,28 @@ } while (ACPI_SUCCESS(status)); if (hp_zx1_setup(sba_hpa + HP_ZX1_IOC_OFFSET, lba_hpa)) - return 1; + return AE_OK; - return 0; + printk(KERN_INFO PFX "Detected HP ZX1 %s AGP chipset (ioc=%lx, lba=%lx)\n", + (char *) context, sba_hpa + HP_ZX1_IOC_OFFSET, lba_hpa); + + hp_zx1_gart_found = 1; + return AE_CTRL_TERMINATE; } -static struct acpi_driver acpi_hp_zx1_gart_driver = { - .name = "HP ZX1 GART Driver", - .ids = "HWP0003", - .ops = { .add = acpi_hp_zx1_gart_add }, -}; +static int __init +hp_zx1_gart_init(void) +{ + acpi_get_devices("HWP0003", hp_zx1_gart_probe, "HWP0003", NULL); + if (hp_zx1_gart_found) + return 0; + + acpi_get_devices("HWP0007", hp_zx1_gart_probe, "HWP0007", NULL); + if (hp_zx1_gart_found) + return 0; + + return -ENODEV; +} #endif /* CONFIG_AGP_HP_ZX1 */ @@ -5812,13 +5827,8 @@ u8 cap_ptr = 0x00; #ifdef CONFIG_AGP_HP_ZX1 - int rc; - - rc = acpi_bus_register_driver(&acpi_hp_zx1_gart_driver); - if (rc > 0) { - printk(KERN_INFO PFX "Detected an HP ZX1 Chipset.\n"); + if (hp_zx1_gart_init() == 0) return 0; - } #endif /*