This patch fixes several bugs in the error handling code for SELinux policy
loading that were introduced by my earlier patch to eliminate unaligned
accesses by that code.
Signed-off-by: Stephen Smalley <sds@epoch.ncsc.mil>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

account_steal_time called for idle doesn't work correctly:
1) steal time while idle needs to be added to the system time of idle
   to get correct uptime numbers
3) if there is an i/o request outstanding the steal time should be
   added to iowait, even if the hypervisor scheduled another virtual
   cpu since we are still waiting for i/o.
2) steal time while idle without an i/o request outstanding has to
   be added to cpustat->idle and not to cpustat->system.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Acked-by: Ingo Molnar <mingo@elte.hu>
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

Use a "pipe_buf_operations" structure to describe the ops that
can be done on a pipe buffer, so that pipe buffers from different
sources can have their own rules.

Right now the rules are just about how you map the buffers into
kernel virtual memory space, and how to release them (and whether
you can append new data to the end of an existing buffer).

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

Compat syscalls need to start compat_sys_ otherwise PA-RISC's compat
syscall wrappers don't work.  Not that the individual involved bothered
to patch PA-RISC ...
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Paul Mackerras points out that doing the _raw_spin_trylock each time
through the loop will generate tons of unnecessary bus traffic.
Instead, after we fail to get the lock we should poll it with simple
loads until we see that it is clear and then retry the atomic op. 
Assuming a reasonable cache design, the loads won't generate any bus
traffic until another cpu writes to the cacheline containing the lock.

Agreed.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

Device drivers are supposed to provide their own ->attach and ->cleanup.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Use now available ide_dma_intr() in etrax_dma_intr().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Make ide_dma_intr() always available if CONFIG_BLK_DEV_IDEDMA=y
and use it instead of icside_dmaintr().  Acked by Russell.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

This cruft pre-dates benh's PowerManagement code.
Moreover ->suspend_reset is always equal to zero.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>

add IXP400 ID

From: Frederick Li <fli@ati.com>

update PCI IDs
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

From: Zhongjun, Wang <wangzhongjun@ccoss.com.cn>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

From: Prarit Bhargava <prarit@sgi.com>

Suppress output of "Wait for ready failed before probe !" messages for 
non-existant interfaces.

Please see 
http://marc.theaimsgroup.com/?l=linux-ide&m=110553792013649&w=2 for 
further context on this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Hi,

now that you cleaned up the ide-io.c code to be all in the right file,
try_to_flush_leftover_data can become static since all users are in this
file now.

bart: also remove declaration from <linux/ide.h>
Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

From: Gunther Mayer <gunther.mayer@gmx.net>

this improves logic and readability:
- remove blank from: AbortedCommand (as other flags)
- add blank and {} to error= line
- clean up: remove 2 lines and extra printk

before:
  hdd: status error: status=0x7f { DriveReady DeviceFault SeekComplete 
DataRequest CorrectedError Index Error }
  hdd: status error: error=0x7fIllegalLengthIndication EndOfMedia 
Aborted Command MediaChangeRequested LastFailedSense 0x07

after:
  hdd: status error: status=0x7f { DriveReady DeviceFault SeekComplete 
DataRequest CorrectedError Index Error }
  hdd: status error: error=0x7f { IllegalLengthIndication EndOfMedia 
AbortedCommand MediaChangeRequested LastFailedSense=0x07 }
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Description: Uses ssleep() in place of cdrom_sleep() to guarantee the task
delays as expected. Remove cdrom_sleep() definition, as this is the only place
where it is called.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Acked-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

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

We don't set GENHD_FL_REMOVABLE because this flag indicates that
the media may be removed while the block device persists.  Since
MMC destroys the block device when the card (media + on-board
controller) is removed, the block device will never exist without
media present.  Therefore, setting GENHD_FL_REMOVABLE would be
misleading.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>

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

Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Don't use uart_change_speed() when trying to restore the serial
console settings - the port may not have a tty associated with
it.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>

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

Patch from Catalin Marinas

This is needed since ARMv6 branch prediction tagging is done by the
virtual address and the ASIDs aren't taken into account.

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

Patch from Ben Dooks

Update to the s3c2410/s3c2440 clock code to use
the naming conventions now used throughout the
arch/arm/mach-s3c2410/ directory, as well as
a re-organisation of the initialisation of the
clocks.
The previous method was to initialise the clocks
as part of the function that initialised the
statically mapped IO regions, which was called
from the machine initialisation. This proves
a problem if the machine initialisation needs
to use these IO areas to determine the frequency
of PLL crystal fitted.
This patch makes the following changes:
 - s3c2410_init_clocks renamed s3c24xx_setup_clocks
 - s3c2410_clkcon_enable renamed s3c24xx_clk_enable
 - s3c2410_register_clock renamed s3c24xx_register_clock
 - cpu specific init_clocks to be called from cpu.c
 - add s3c24xx_init_clocks for machine init to call
 - split the cpu specific clock code from xxx_map_io
 - update all machine initialisation methods
and the following changes as cleanup which should
have been caught by previous patches:
 - remove s3c2440_hdiv (unused)
 - remove s3c2440_clock_tick_rate (unused)
This patch has been generated from a request by
Dimitry Andric.

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

Patch from Catalin Marinas

This file no longer needs to be included in arch/arm/vfp/entry.S
because of the inclusion of asm/constants.h.

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

The caller does not necessarily have the socket locked
(udpv6sendmsg() is one such case) so we have to use
sk_dst_check() instead of __sk_dst_check().
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

We need to do the proper checks before we try to
pull space out of it, just like sendmsg() does.
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Dave Jones <davej@redhat.com>

into delerium.kernelslacker.org:/mnt/data/src/bk/cpufreq

With 2.6.10-mm2 (or even with -mm1) some structures in struct psb_s have been
renamed in powernow-k8.h, but the renaming has not been done properly for all
occurences in powernow-k8.c.
This prevents cpufreq from accepting the BIOS PST-tables.

The following patch corrects this by renaming the incorrectly named variable
in powernow-k8.c, following the definition in the powernow-k8.h header file.
Signed-off-by: Hans-Frieder Vogt <hfvogt@arcor.de>
Signed-off-by: Dominik Brodowski <linux@brodo.de>
Signed-off-by: Dave Jones <davej@redhat.com>

Fix to return a proper cpu speed. it is caused by mistaking the meaning
of on and off.
Signed-Off-by: Hiroshi Miura <miura@da-cha.org>
Signed-off-by: Dominik Brodowski <linux@brodo.de>
Signed-off-by: Dave Jones <davej@redhat.com>

From: "Pallipadi, Venkatesh" <venkatesh.pallipadi@intel.com>

The transient MSR values are for very short duration and so I feel reading
out the last set frequency is better than looping until reading something
expected.
Signed-off-by: Dominik Brodowski <linux@brodo.de>
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Dave Jones <davej@redhat.com>

From: "Pallipadi, Venkatesh" <venkatesh.pallipadi@intel.com>

In P4, CPU tsc rate won't change with CPU frequency change while using Enhanced
Speedstep Technology. Tested with both speedstep-centrino and acpi-cpufreq on
both i386 and x86-64.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Dominik Brodowski <linux@brodo.de>
Signed-off-by: Dave Jones <davej@redhat.com>

Dothan is stepping 13  == 0x0D instead of 0x13 == 19

This bug crept bag in the shadows caused by the debug overhauling patch.
Signed-off-by: Dominik Brodowski <linux@brodo.de>
Signed-off-by: Dave Jones <davej@redhat.com>

From: Bruno Ducrot <ducrot@poupinou.org>

dbs_timer_init() will schedule_work(&dbs_work) so that do_dbs_timer()
is likely called very early at same time slice scheduler, and
for each cpu, dbs_check_cpu(cpu) will be called, likely at the same time
slice than dbs_timer_init().
So far, we will get total_idle_ticks == idle_ticks == 0 unconditonaly,
and the processor will be put at full speed even though it's not needed
at startup.


Ack'ed by Venkatesh Pallipadi.
Signed-off-by: Bruno Ducrot <ducrot@poupinou.org>
Signed-off-by: Dominik Brodowski <linux@brodo.de>
Signed-off-by: Dave Jones <davej@redhat.com>

into nuts.davemloft.net:/disk1/BK/net-2.6

- make some needlessly global code static
- remove the following unused functions:
  - exthdrs.c: ipv6_build_rthdr
  - exthdrs.c: ipv6_build_exthdr
  - exthdrs.c: ipv6_build_nfrag_opts
  - exthdrs.c: ipv6_build_frag_opts
- remove the following write-only global variables:
  - addrconf.c: inet6_dev_count
  - addrconf.c: inet6_ifa_count
- #if 0 the following unused global variable:
  - addrconf.c: in6addr_any
- remove the following unneeded EXPORT_SYMBOL's:
  - ipv6_syms.c: in6addr_any
  - ipv6_syms.c: in6addr_loopback
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: David S. Miller <davem@davemloft.net>