Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.de>
Signed-off-by: Len Brown <len.brown@intel.com>

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.de>
Signed-off-by: Len Brown <len.brown@intel.com>

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.de>
Signed-off-by: Len Brown <len.brown@intel.com>

into intel.com:/home/lenb/src/26-latest-hotplug

into intel.com:/home/lenb/src/26-latest-dev

into intel.com:/home/lenb/src/26-latest-dev

into intel.com:/home/lenb/src/26-latest-dev

ACPI 3.0 support is nearing completion in both the iASL
compiler and the ACPI CA core subsystem.

Fixed a problem in the ToDecimalString operator where the
resulting string length was incorrectly calculated. The
length is now calculated exactly, eliminating incorrect
AE_STRING_LIMIT exceptions.

Fixed a problem in the ToHexString operator to allow a
maximum 200 character string to be produced.

Fixed a problem in the internal string-to-buffer and
buffer-to-buffer copy routine where the length of the
resulting buffer was not truncated to the new size (if
the target buffer already existed).
Signed-off-by: Len Brown <len.brown@intel.com>

This fixes a warning when resuming the USB EHCI host controller driver.

From: David Brownell <david-b@pacbell.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>

It's causing a few as-yet-not-understood problems.  So make a zero value of
/proc/sys/vm/swap_token_timeout disable the feature, and make the default
be zero.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch reverts the additions of an ABI supporting thread and process
CPU clocks in the posix-timers code.  This returns us to 2.6.9's condition,
there is no support for any new clockid_t values for process CPU clocks.

This also fixes the return value for clock_nanosleep when unsupported (I
think this is used only by sgi-timer at the moment).  The POSIX-specified
code for valid clocks that don't support the sleep operation is ENOTSUP.
On most architectures the kernel doesn't define ENOTSUP and this name is
defined in userland the same as the kernel's EOPNOTSUPP.
Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Patch from George G. Davis

Just a quick update for integrator_defconfig so it builds a useable
kernel. These may not be ideal settings for all users but allows
building kernels for the Integrator AP which basically work "out
of the box".

Signed-off-by: George G. Davis
Signed-off-by: Russell King

Patch from Holger Hans Peter Freyther

This patch adds installation of flash devices and partition from within simpad.c . The information of extracted from the old sa1100 flash map.


Signed-off-by: Holger Hans Peter Freyther
Signed-off-by: Russell King

Patch from Holger Hans Peter Freyther

Remove the exportation of CS3 via procfs


Signed-off-by: Holger Hans Peter Freyther
Signed-off-by: Russell King

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Patch from Pierre Ossman

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into intel.com:/home/lenb/src/26-latest-dev

Fix a pretty bad bug that caused sometimes signals on x86-64
to be restarted like system calls. This corrupted the RIP and
in general caused undesirable effects.

The problem happens because orig_rax is unsigned on x86-64,
but it originally was signed when the signal code was written.
And the if (orig_rax >= 0) ended up always true.
And gcc didn't warn about this, because the warning is only in 
-Wextra. 

In 2.4 we still had a cast for it, but somehow it got dropped
in 2.5.

Credit goes to John Slice for tracking it down and Erich Boleyn
for the original fix. All blame to me. I fixed it at another
place too.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into intel.com:/home/lenb/src/26-latest-dev

This should go in before 2.6.10. It fixes a forgotten case to provide
police backward compatibility statistics for old iproute2 versions
running on a new kernel with actions enabled. Should make distributions
happy with older iproute2 versions and all-included kernel configs
since they probably favour actions over plain policer.

Testing results:
  iproute2-2.4.7 on 2.6.10-rc3-bk8:
  cls-police: police creation succeeded
  cls-police: Sending 10 ICMP echo requests
  cls-police: police dumping succeeded with output:
  filter protocol ip pref 10 u32 
  filter protocol ip pref 10 u32 fh 800: ht divisor 1 
  filter protocol ip pref 10 u32 fh 800::800 order 2048 key ht 800 bkt 0 flowid 10:12 
  police 3 action drop rate 2Kbit burst 10Kb mtu 2Kb 
    match 00010000/00ff0000 at 8
   Sent 420 bytes 10 pkts (dropped 0, overlimits 0)  <-- This would have been missing
  cls-police: police deletion succeeded

 iproute2-2.6.9 on 2.6.10-rc3-bk8:
 ...
  filter protocol ip pref 10 u32 
  filter protocol ip pref 10 u32 fh 800: ht divisor 1 
  filter protocol ip pref 10 u32 fh 800::800 order 2048 key ht 800 bkt 0 flowid 10:12  (rule hit 10 success 10)
    match 00010000/00ff0000 at 8 (success 10 ) 
   police 0x4 rate 2000bit burst 10Kb mtu 2Kb action drop 
  ref 1 bind 1
   Sent 420 bytes 10 pkts (dropped 0, overlimits 0) 
 ...

 (Same results for fw classifier)
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

tcindex's destroy uses its own delete functions to destroy its
configuration. The delete function (correctly) takes the qdisc_tree_lock
to prevent list walkings from happening while removing from the list.
The qdisc_tree_lock is already held if we're comming via the destroy
path and thus a double locking takes place.
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

This fixes a memory leak where the percpu internal structure is not freed. 
Repeated add/remove device illustrates the leak nicely.
Signed-off-by: Philip R. Auld <pauld@egenera.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

cdrom_read_toc (ide-cd.c) always reads the TOC using MSF format.  If the
last session of the disk starts beyond block 1152000 (LBA) there's an
overflow in the MSF format and kernel complains:

Unable to identify CD-ROM format.

I reported this bug a while ago (see bug #1930 on bugzilla) and Andy
Polyakov tracked it down.

Read the multi-session TOC in LBA format in order to avoid an overflow
in MSF format when the last session starts beyond block 1152000 (LBA).
Signed-off-by: Luca Tettamanti <kronos@kronoz.cjb.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

There is a race condition int pty.c when pty_close wakes up waiter on its
pair device before set TTY_OTHER_CLOSED flag.

It is possible on SMP or preempt kernel, waiter wakes up too early that it
will not get TTY_OTHER_CLOSED flag then fall into sleep again - missed wakeup.

hjl reports that this bug will hang some expect scripts on SMP machines.
Signed-off-by: Zou Nan hai <Nanhai.zou@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Patch from Nicolas Pitre

... also remove an unused variable warning.

Signed-off-by: Nicolas Pitre
Signed-off-by: Russell King

Patch from George G. Davis

Turn on ARMv6 VFP copressor, if present. According to the ARM1136 TRM,
setting CACR bits will be ignored if the coprocessor is not present. In
that case, this is change has no effect.

Signed-off-by: George G. Davis
Signed-off-by: Russell King

Patch from Ben Dooks

clkout0 has the name of clkout1

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Patch from Catalin Marinas

This is needed to avoid the implicit declaration of the
cache_is_vipt_aliasing() macro defined in cacheflush.h.

Signed-off-by: Catalin Marinas
Signed-off-by: Russell King

Don't allow user space mappings in the first page even if we are
using high vectors - this may prevent BUG() from working, as well
as allowing kernel NULL pointer derefs to be silently ignored.

Rather than working out where the vector page is mapped, always
map the vector page at the high vectors location, and conditionally
handle the coherency issues with the low vector mapping if present.

Addresses bug #3863, from <daveh@dmh2000.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The aty128fb driver in 2.6.10-rc3 tries to release an unrequested range
during driver unload.  This results in the following printout on my Apple
G4 Cube:

Trying to free nonexistent resource <00802400-008024ff>

The remedy is simple - do not release the unrequested range.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Some users have reported problems with the I2O subsystem, which was
caused by the timeout to fetch the LCT.

- increases the timeout for I2O LCT_GET.  On some systems the time to get
  a reply from the I2O controller is longer then the timeout to wait.
Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This is the third of 3 patches from David Woodhouse which fix various
problems with signal handling on ppc64.

At present, if a signal is being delivered, and the process has specified
delivery of that signal on an alternate stack but the alternate stack that
has been specified is invalid (i.e.  the kernel gets a fault writing to the
alternate stack), then we (correctly) give the process a SIGSEGV but we put
the wrong signal mask in the saved state on the stack - i.e.  we put the
mask that would have been established for the original signal handler
there.

This patch fixes it by making setup_rt_frame, handle_rt_signal32 and
handle_signal32 return a status code to indicate whether they successfully
established a stack frame.  If they fail, the caller doesn't block the
signals specified for the signal handler.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>