From: Anton Blanchard <anton@samba.org>

add missing include guards, from Nathan Lynch

From: Tom Rini <trini@kernel.crashing.org>

Correct the defines for MC146818 RTCs, reg c is interrupts, reg d is not
watchdog (it's valid time & nvram).

into home.osdl.org:/home/torvalds/v2.5/linux

SGI Modid: xfs-linux:xfs-kern:165722a

SGI Modid: xfs-linux:xfs-kern:165673a

SGI Modid: xfs-linux:xfs-kern:165648a

SGI Modid: xfs-linux:xfs-kern:165638a

SGI Modid: xfs-linux:xfs-kern:165631a

SGI Modid: xfs-linux:xfs-kern:165500a

SGI Modid: xfs-linux:xfs-kern:164115a

SGI Modid: xfs-linux:xfs-kern:165646a

SGI Modid: xfs-linux:xfs-kern:165037a

This forward ports a few important fixes from the 2.4 driver.  This
changes have been well tested.

Changelog:
 - Update maintainer email address
 - Mark pci_device_id list with __devinitdata.
 - Set correct protocol type on packet receive (this caused the kernel to
   drop all packets received)
 - Add #ifdef DEBUG around debug printk()
 - ioctl: Add missing size checks before
   copying data from userspace.

into home.osdl.org:/home/torvalds/v2.5/linux

We used to have code to allow binaries linked against glibc to run,
when glibc itself contained some FP instructions (for PCS stack
frames for functions like printf and scanf) thereby allowing FP
emulators like nwfpe to be built as modules.

This has proved to be unreliable with later compilers, so support
for this was dropped a while ago.  Since no one complained, we can
finally remove the dead code.

(NB. a klibc based module-init-tools shouldn't suffer from this
problem.)

According to x86, the pointers for bitops are supposed to be
qualified with volatile.  Make ARM bitops reflect this.

Remove usage of tsk->used_math on ARM, moving the status to an array
of co-processor usage.  (ARM can have up to 15 co-processors
providing various extra facilities such as SIMD, VFP or FP.)

Jakub points out that having an automatic array is not only
bad for performance (and stack usage), gcc has also historically
had lots of bugs here, and gcc-3.2.3 seems to miscompile it
otherwise.

This fixes some issues in the dvb subsystem and some nasty things in the
v4l saa7146 driver.

[DVB]
 - dvb-core: aquire -> acquire spelling fix
 - nxt600 frontend: don't send zero-byte messages when probing the PLL
   type
 - Kconfig: add a note that says that the CI of the budget-CI card is
   not actually supported by the budget-CI driver
 - ttusb-dec: Check for presence of crc32 function.  Make unknown types
   of packet less likely to cause packet loss.

[V4L]
 - saa7146: use kernel mint_t()/max_t() instead of homebrewn stuff
 - saa7146: disable video clipping before capturing for sure to prevent
   black pictures
 - saa7146: make sure to disable the right video dma upon device close
 - saa7146: don't free resources if disabling an already disabled video
   overlay

This is a simple fix for some of the problems with bad ACPI frequency values:

  Abort if the frequency field in _PSS is zero, as we're having a
  completely broken ACPI table then.

A more complete overhaul of the acpi-cpufreq driver (where the cause of
the problem lies) is in the latest acpi-test tree, but that's definitely
something to be delayed for 2.6.3 -- and the same is true for the
yet-to-be-written do_div64 conversion.

This fixes my APM problems (without them my laptop, Acer TravelMate
210TEV (Celeron 700, 128 MB RAM), hangs after resuming from APM since
2.6.0-test4).

Modified based on comments from Pavel Machek <pavel@suse.cz>, who
has acked the updated patch.

- Replaces pci.ids with a snapshot from pciids.sf.net from 14 Jan 2004

- Changes gen-devlist.c to truncate long device names rather than reject
  the database
- Changes PCI_NAME_SIZE to 96 (and PCI_NAME_HALF to 43) to allow all
  current pci.ids names to fit
- Modifies gen-devlist.c to truncate at 89 characters rather than 79 -
  allows for two digit instance numbers to be added to the name as well
  while staying within the 96 characters allocated. No names in the
  current pci.ids are any longer than this.
- Modifies names.c to no longer limit device name length when displaying
  both vendor and device name; the truncation is done by gen-devlist.c.

This lets the PPC pci hotplug driver initialize single devices, not just
entire slots.

insert missing iounmap()

This is the pending patch that adds 'address' file to show
PCI-address and a few other minor fixes.
As 2.6.0 is out, I'm resending the patch.
Would you mind taking this?

> > > Thanks.  I had a little time to try your patch today.  Sorry
> > > to report that it isn't working for me.
> > >
> > > I first powered off (successfully the 1st time) a populated slot
> > > and removed and reinserted the card into the same slot.  The slot
> > > powered back up but I was then unable to power it off.  I believe
> > > the following instruction that still exists in power_off_slot()
> > > may be preventing the slot from being powered off more than once.
> > >     func->flags &= (~FUNC_EXISTS);
> > >
> > > I then tried to insert an adapter in an un-populated slot.  For
> > > some reason (which I don't understand yet) there was an enabling
> > > error which I believe caused enable_device() to exit via a path
> > > that bypassed the instruction that sets the FUNC_EXISTS flag.
> > > I was then unable to power off the slot which I believe was due
> > > to the FUNC_EXISTS flag not being set.
> > >
> > > I didn't have time to definitely confirmed the above theories.
> > > I'll take a closer look at this tomorrow unless you are able
> > > to diagnose using my vague clues :)
> >
> > It turns out that both of the above mentioned problems happened
> > because the call to acpiphp_configure_slot() from enable_device()
> > failed after inserting the card.  When this happens enable_device()
> > exits without setting the FUNC_EXISTS flag for any of the slot
> > functions.  Subsequent attempts to power off the same slot fail
> > when power_off_slot() is unable to locate a function with both
> > FUNC_HAS_EJ0 and FUNC_EXISTS flags set.
> >
> > The patch works okay when using a card that allows
> > acpiphp_configure_slot() to succeed but I believe it should
> > be improved to allow the slot to be powered off following
> > device enablement errors.
>
> Thanks for testing and comments.
> I really appreciate it.
>
> This problem turned out to be somewhat fragile state
> transition:
>
> a lifecycle of a slot is (if there's no error)
>
>   function             state
> ----------------------------------------------------
> 0                      nothing
> 1  power_on_slot()  -> SLOT_POWERDON
> 2  enable_device()  -> SLOT_POWEREDON + SLOT_ENABLED
> 3  disable_device() -> SLOT_POWEREDON
> 4  power_off_slot() -> nothing
>
> but if any error occur during enable_device(), slot will remain
> SLOT_POWERDON, but some functions on the card may not have
> FUNC_EXISTS flags, which will eventually prevents powering
> off in power_off_slot(), state transition from 1 to 4 directly.
> I.e, the FUNC_EXISTS flag introduced more states to
> complicate things.
>
> The FUNC_EXISTS flag was introduced after some discussion
> between me and Irene Zubarev, but it has no more meaning
> than that the function has corresponding 'pci_dev' structure.
> So I eliminated the usage of FUNC_EXISTS and the result is
> the patches attached to this mail (for both 2.4 and 2.6.
> I think Greg already applied the 2.4 'cleanup' patch to his tree,
> but it's not in Marcelo's release so I'm re-attaching to
> this mail for anyone interested in this topic.  It's identical
> to the one I posted earlier).
> These patches don't include Gary's patch in his post last week,
> so please apply separately.
>
> Please note that current acpiphp driver cannot handle a
> PCI card that has a PCI-to-PCI bridge on it (support
> for such cards is incomplete).  But if it's treated as
> an error, it should be recoverable anyway.

This just gets rid of a stupid compile warning.

On Wed, Dec 17, 2003 at 04:24:44PM -0800, Greg KH wrote:
> I've applied the pci portions of this patch to my trees and will send it
> on after 2.6.0 is out.

James Bottomley found a bug in it; could you also apply:

This is in case others copy this code (which has already happened...)

tg3.c has a bug where it can find the wrong 5704 peer on a machine with
PCI domains.  The problem is that pci_find_slot() can't distinguish
whether it has the correct domain or not.

This patch fixes that problem by introducing pci_get_slot().

This is needed to show pci bus topology to userspace properly.

When plugging a 33MHz card into a bus that's running at 66MHz, I'd like
to see a better error message than:

acpiphp_glue: notify_handler: unknown event type 0x5 for \_SB_.SBA0.PCI4.S2F0

The following patch would give us:

Device \_SB_.SBA0.PCI4.S2F0 cannot be configured due to a frequency mismatch

which I think is clearer.