14 years agoSUNRPC: Fix a memory leak in rpc_create()
Chuck Lever [Mon, 7 Apr 2008 20:52:44 +0000 (16:52 -0400)]
SUNRPC: Fix a memory leak in rpc_create()

Commit 510deb0d was supposed to move the xprt_create_transport() call in
rpc_create(), but neglected to remove the old call site.  This resulted in
a transport leak after every rpc_create() call.

This leak is present in 2.6.24 and 2.6.25.

Signed-off-by: Chuck Lever <>
Signed-off-by: Trond Myklebust <>
14 years agofix bug - executing FDPIC ELF on NFS mount triggers BUG() at mm/nommu.c:862:/do_mmap_...
Bryan Wu [Wed, 2 Apr 2008 03:23:39 +0000 (20:23 -0700)]
fix bug - executing FDPIC ELF on NFS mount triggers BUG() at mm/nommu.c:862:/do_mmap_private()

NFS needs a NOMMU version mmap function to support uClinux on NOMMU machine

Signed-off-by: Bryan Wu <>
Cc: Mike Frysinger <>
Signed-off-by: Trond Myklebust <>
14 years agoNFS: initialize flags field in nfs_open_context
Jeff Layton [Mon, 31 Mar 2008 19:01:58 +0000 (15:01 -0400)]
NFS: initialize flags field in nfs_open_context

The nfs_open_context struct had a "flags" field added recently, but the
allocator isn't initializing it. It also looks like the allocator isn't
initializing the mode or list either, but they seem to be overwritten
by the caller, so that's less of an issue.

Signed-off-by: Jeff Layton <>
Signed-off-by: Trond Myklebust <>
14 years agoSUNRPC: don't call flush_dcache_page() with an invalid pointer
Trond Myklebust [Mon, 31 Mar 2008 21:02:02 +0000 (17:02 -0400)]
SUNRPC: don't call flush_dcache_page() with an invalid pointer

Fix a problem in _copy_to_pages(), whereby it may call flush_dcache_page()
with an invalid pointer due to the fact that 'pgto' gets incremented
beyond the end of the page array. Fix is to exit the loop without this
unnecessary increment of pgto.

Signed-off-by: Trond Myklebust <>
14 years agoMerge branch 'for-linus' of git://
Linus Torvalds [Tue, 8 Apr 2008 02:15:35 +0000 (19:15 -0700)]
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/selinux-2.6

* 'for-linus' of git://
  SELinux: more GFP_NOFS fixups to prevent selinux from re-entering the fs code

14 years agopvrusb2: fix broken build due to patch order dependency
Michael Krufky [Mon, 7 Apr 2008 00:40:17 +0000 (20:40 -0400)]
pvrusb2: fix broken build due to patch order dependency

Fix broken build due to patch order dependency.  A future patch requires
the lines that break the current build.  Disable those lines for now.

Signed-off-by: Michael Krufky <>
Acked-by: Mauro Carvalho Chehab <>
Signed-off-by: Linus Torvalds <>
14 years agoSELinux: more GFP_NOFS fixups to prevent selinux from re-entering the fs code
Stephen Smalley [Fri, 4 Apr 2008 12:46:05 +0000 (08:46 -0400)]
SELinux: more GFP_NOFS fixups to prevent selinux from re-entering the fs code

More cases where SELinux must not re-enter the fs code. Called from the
d_instantiate security hook.

Signed-off-by: Stephen Smalley <>
Signed-off-by: James Morris <>
14 years agoMerge branch 'upstream' of git://
Linus Torvalds [Mon, 7 Apr 2008 21:54:07 +0000 (14:54 -0700)]
Merge branch 'upstream' of git://git./linux/kernel/git/ralf/upstream-linus

* 'upstream' of git://
  [MIPS] Handle aliases in vmalloc correctly.

14 years ago[MIPS] Handle aliases in vmalloc correctly.
Ralf Baechle [Sat, 5 Apr 2008 14:13:23 +0000 (15:13 +0100)]
[MIPS] Handle aliases in vmalloc correctly.

flush_cache_vmap / flush_cache_vunmap were calling flush_cache_all which -
having been deprecated - turned into a nop ...

Signed-off-by: Ralf Baechle <>
14 years agoMerge git://
Linus Torvalds [Mon, 7 Apr 2008 21:26:53 +0000 (14:26 -0700)]
Merge git://git./linux/kernel/git/bart/ide-2.6

* git://
  siimage: fix kernel oops on PPC 44x

14 years agosiimage: fix kernel oops on PPC 44x
Sergei Shtylyov [Mon, 7 Apr 2008 21:30:10 +0000 (23:30 +0200)]
siimage: fix kernel oops on PPC 44x

Fix kernel oops due to machine check occuring in init_chipset_siimage() on PPC
44x platforms.  These 32-bit CPUs have 36-bit physical address and PCI I/O and
memory spaces are mapped beyond 4 GB; arch/ppc/ code has a fixup in ioremap()
that creates an illusion of the PCI I/O and memory resources being mapped below
4 GB, while arch/powerpc/ code got rid of this fixup with PPC 44x having instead
CONFIG_RESOURCES_64BIT=y -- this causes the resources to be truncated to 32-bit
'unsigned long' type in this driver, and so non-existant memory being ioremap'ed
and then accessed...

Thanks to Valentine Barshak for providing an initial patch and explanations.

Signed-off-by: Sergei Shtylyov <>
Signed-off-by: Bartlomiej Zolnierkiewicz <>
14 years agovirtio_net: remove overzealous printk
Anthony Liguori [Mon, 7 Apr 2008 20:33:16 +0000 (15:33 -0500)]
virtio_net: remove overzealous printk

The 'disable_cb' is really just a hint and as such, it's possible for more
work to get queued up while callbacks are disabled.  Under stress with an
SMP guest, this printk triggers very frequently.  There is no race here, this
is how things are designed to work so let's just remove the printk.

Signed-off-by: Anthony Liguori <>
Acked-by: Rusty Russell <>
Signed-off-by: Linus Torvalds <>
14 years agoRevert "smc91x: fix build breakage from the SMC_GET_MAC_ADDR API upgrade"
Linus Torvalds [Mon, 7 Apr 2008 20:20:08 +0000 (13:20 -0700)]
Revert "smc91x: fix build breakage from the SMC_GET_MAC_ADDR API upgrade"

This reverts commit 9e6db60825ef7e7999abc610ce256ba768e58162, which was
merged without the API it needed, causing build breakage.

Reported-by: Bryan Wu <>
Acked-by: Jeff Garzik <>
Signed-off-by: Linus Torvalds <>
14 years agoMerge branch 'for-linus' of git://
Linus Torvalds [Mon, 7 Apr 2008 20:14:37 +0000 (13:14 -0700)]
Merge branch 'for-linus' of git://git./linux/kernel/git/x86/linux-2.6-x86

* 'for-linus' of git://
  x86: fix 64-bit asm NOPS for CONFIG_GENERIC_CPU
  x86: fix call to set_cyc2ns_scale() from time_cpufreq_notifier()
  revert "x86: tsc prevent time going backwards"

14 years agovirtio: remove overzealous BUG_ON.
Rusty Russell [Mon, 7 Apr 2008 04:30:28 +0000 (14:30 +1000)]
virtio: remove overzealous BUG_ON.

The 'disable_cb' callback is designed as an optimization to tell the host
we don't need callbacks now.  As it is not reliable, the debug check is
overzealous: it can happen on two CPUs at the same time.  Document this.

Even if it were reliable, the virtio_net driver doesn't disable
callbacks on transmit so the START_USE/END_USE debugging reentrance
protection can be easily tripped even on UP.

Thanks to Balaji Rao for the bug report and testing.

Signed-off-by: Rusty Russell <>
CC: Balaji Rao <>
Signed-off-by: Linus Torvalds <>
14 years agox86: fix 64-bit asm NOPS for CONFIG_GENERIC_CPU
Suresh Siddha [Mon, 7 Apr 2008 18:56:34 +0000 (11:56 -0700)]
x86: fix 64-bit asm NOPS for CONFIG_GENERIC_CPU

ASM_NOP's for 64-bit kernel with CONFIG_GENERIC_CPU is broken
with the recent x86 nops merge. They were using GENERIC_NOPS
which will truncate the upper 32bits of %rsi, because of the missing
64bit rex prefix.

For now, fall back ASM NOPS for generic cpu to K8 NOPS, similar
to the code before the wrong x86 nop merge.

This should resolve the crash seen by Ingo on a test-system:

BUG: unable to handle kernel paging request at 00000000d80d8ee8
IP: [<ffffffff802121af>] save_i387_ia32+0x61/0xd8
PGD b8e0067 PUD 51490067 PMD 0
Oops: 0000 [1] SMP
Modules linked in:
Pid: 3871, comm: distcc Not tainted 2.6.25-rc7-sched-devel.git-x86-latest.git #359
RIP: 0010:[<ffffffff802121af>]  [<ffffffff802121af>] save_i387_ia32+0x61/0xd8
RSP: 0000:ffff81003abd3cb8  EFLAGS: 00010246
RAX: ffff810082e93400 RBX: 00000000ffc37f84 RCX: ffff8100d80d8ee0
RDX: 0000000000000000 RSI: 00000000d80d8ee0 RDI: ffff810082e93400
RBP: 00000000ffc37fdc R08: 00000000ffc37f88 R09: 0000000000000008
R10: ffff81003abd2000 R11: 0000000000000000 R12: ffff810082e93400
R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000
FS:  0000000000000000(0000) GS:ffff81011fb12dc0(0063) knlGS:00000000f7f1a6c0
CS:  0010 DS: 002b ES: 002b CR0: 0000000080050033
CR2: 00000000d80d8ee8 CR3: 0000000076922000 CR4: 00000000000006e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
Process distcc (pid: 3871, threadinfo ffff81003abd2000, task ffff8100d80d8ee0)
Stack:  ffff8100bb670380 ffffffff8026de50 0000000000000118 0000000000000002
 0000000000000002 ffff81003abd3e68 ffff81003abd3ed8 ffff81003abd3de8
 ffff81003abd3d18 ffffffff80229785 ffff8100d80d8ee0 ffff810001041280
Call Trace:
 [<ffffffff8026de50>] ? __generic_file_aio_write_nolock+0x343/0x377
 [<ffffffff80229785>] ? update_curr+0x54/0x64
 [<ffffffff80227cd3>] ? ia32_setup_sigcontext+0x125/0x1d2
 [<ffffffff8022839f>] ? ia32_setup_frame+0x73/0x1a5
 [<ffffffff8020b2a5>] ? do_notify_resume+0x1aa/0x7db
 [<ffffffff8024ae8c>] ? getnstimeofday+0x31/0x85
 [<ffffffff80249858>] ? ktime_get_ts+0x17/0x48
 [<ffffffff80249933>] ? ktime_get+0xc/0x41
 [<ffffffff8024973e>] ? hrtimer_nanosleep+0x75/0xd5
 [<ffffffff80249261>] ? hrtimer_wakeup+0x0/0x21
 [<ffffffff8020bfbc>] ? int_signal+0x12/0x17
 [<ffffffff8030e6b3>] ? dummy_file_free_security+0x0/0x1

Code: a6 08 05 00 00 f6 40 14 01 74 34 4c 89 e7 48 0f ae 07 48 8b 86 08 05 00 00 80 78 02 00 79 02 db e2 90 8d b4 26 00 00 00 00 89 f6 <48> 8b 46 08 83 60 14 fe 0f 20 c0 48 83 c8 08 0f 22 c0 eb 07 c6

Signed-off-by: Suresh Siddha <>
Signed-off-by: Ingo Molnar <>
14 years agox86: fix call to set_cyc2ns_scale() from time_cpufreq_notifier()
Karsten Wiese [Mon, 7 Apr 2008 10:14:45 +0000 (12:14 +0200)]
x86: fix call to set_cyc2ns_scale() from time_cpufreq_notifier()

In time_cpufreq_notifier() the cpu id to act upon is held in freq->cpu. Use it
instead of smp_processor_id() in the call to set_cyc2ns_scale().
This makes the preempt_*able() unnecessary and lets set_cyc2ns_scale() update
the intended cpu's cyc2ns.

Related mail/thread:

Signed-off-by: Karsten Wiese <>
Signed-off-by: Ingo Molnar <>
14 years agorevert "x86: tsc prevent time going backwards"
Ingo Molnar [Mon, 7 Apr 2008 18:58:08 +0000 (20:58 +0200)]
revert "x86: tsc prevent time going backwards"


| commit 47001d603375f857a7fab0e9c095d964a1ea0039
| Author: Thomas Gleixner <>
| Date:   Tue Apr 1 19:45:18 2008 +0200
|     x86: tsc prevent time going backwards

it has been identified to cause suspend regression - and the
commit fixes a longstanding bug that existed before 2.6.25 was
opened - so it can wait some more until the effects are better

Signed-off-by: Ingo Molnar <>
14 years agoMerge git://
Linus Torvalds [Mon, 7 Apr 2008 15:36:57 +0000 (08:36 -0700)]
Merge git://git./linux/kernel/git/davem/net-2.6

* git://
  fix endian lossage in forcedeth
  net/tokenring/olympic.c section fixes
  net: marvell.c fix sparse shadowed variable warning
  [VLAN]: Fix egress priority mappings leak.
  [TG3]: Add PHY workaround for 5784
  [NET]: srandom32 fixes for networking v2
  [IPV6]: Fix refcounting for anycast dst entries.
  [IPV6]: inet6_dev on loopback should be kept until namespace stop.
  [IPV6]: Event type in addrconf_ifdown is mis-used.
  [ICMP]: Ensure that ICMP relookup maintains status quo

14 years agoMerge git://
Linus Torvalds [Mon, 7 Apr 2008 15:36:37 +0000 (08:36 -0700)]
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://
  [SPARC64]: Fix user accesses in regset code.
  [SPARC64]: Fix FPU saving in 64-bit signal handling.

14 years agoMerge branch 'pci_id_updates' of git://
Linus Torvalds [Sun, 6 Apr 2008 23:12:24 +0000 (16:12 -0700)]
Merge branch 'pci_id_updates' of git://git./linux/kernel/git/mchehab/v4l-dvb

* 'pci_id_updates' of git://
  V4L/DVB (7497): pvrusb2: add new usb pid for 73xxx models
  V4L/DVB (7496): pvrusb2: add new usb pid for 75xxx models

14 years agoMerge git://
Linus Torvalds [Sun, 6 Apr 2008 23:11:57 +0000 (16:11 -0700)]
Merge git://git./linux/kernel/git/mchehab/v4l-dvb

* git://
  V4L/DVB (7499): v4l/dvb Kconfig: Fix bugzilla #10067
  V4L/DVB (7495): s5h1409: fix blown-away bit in function s5h1409_set_gpio
  V4L/DVB (7460): bttv: Bt832 - fix possible NULL pointer deref

14 years agoMerge git://
Linus Torvalds [Sun, 6 Apr 2008 23:11:22 +0000 (16:11 -0700)]
Merge git://git./linux/kernel/git/wim/linux-2.6-watchdog

* git://
  [WATCHDOG] it8712f_wdt Zero MSB timeout byte when disabling watchdog

14 years agoFix booting pentium+ with dodgy TSC
Rusty Russell [Sun, 6 Apr 2008 07:23:38 +0000 (17:23 +1000)]
Fix booting pentium+ with dodgy TSC

We handle a broken tsc these days, so no need to panic.  We clear the
TSC bit when tsc_init decides it's unreliable (eg.  under lguest w/ bad
host TSC), leading to bogus panic.

Signed-off-by: Rusty Russell <>
Acked-by: Ingo Molnar <>
Signed-off-by: Linus Torvalds <>
14 years agofix IS_I9XX macro in i915 DRM driver
Jesse Barnes [Sun, 6 Apr 2008 18:55:04 +0000 (11:55 -0700)]
fix IS_I9XX macro in i915 DRM driver

Now that we're mapping registers in the DRM driver at load time, the
driver actually checks the PCI ID, so we need to make sure the macros
have all the right bits (and longer term use the DRM headers as the sole
copy of the PCI & register definitions).

This patch adds 945GME support to the DRM headers, fixing a regression
reported in

Tested-by: Alexander Oltu <>
Signed-off-by: Jesse Barnes <>
Signed-off-by: Linus Torvalds <>
14 years agoscsi: fix sense_slab/bio swapping livelock
Hugh Dickins [Sun, 6 Apr 2008 22:56:57 +0000 (23:56 +0100)]
scsi: fix sense_slab/bio swapping livelock

Since 2.6.25-rc7, I've been seeing an occasional livelock on one x86_64
machine, copying kernel trees to tmpfs, paging out to swap.

Signature: 6000 pages under writeback but never getting written; most
tasks of interest trying to reclaim, but each get_swap_bio waiting for a
bio in mempool_alloc's io_schedule_timeout(5*HZ); every five seconds an
atomic page allocation failure report from kblockd failing to allocate a
sense_buffer in __scsi_get_command.

__scsi_get_command has a (one item) free_list to protect against this,
but rc1's [SCSI] use dynamically allocated sense buffer
de25deb18016f66dcdede165d07654559bb332bc upset that slightly.  When it
fails to allocate from the separate sense_slab, instead of giving up, it
must fall back to the command free_list, which is sure to have a
sense_buffer attached.

Either my earlier -rc testing missed this, or there's some recent
contributory factor.  One very significant factor is SLUB, which merges
slab caches when it can, and on 64-bit happens to merge both bio cache
and sense_slab cache into kmalloc's 128-byte cache: so that under this
swapping load, bios above are liable to gobble up all the slots needed
for scsi_cmnd sense_buffers below.

That's disturbing behaviour, and I tried a few things to fix it.  Adding
a no-op constructor to the sense_slab inhibits SLUB from merging it, and
stops all the allocation failures I was seeing; but it's rather a hack,
and perhaps in different configurations we have other caches on the
swapout path which are ill-merged.

Another alternative is to revert the separate sense_slab, using
cache-line-aligned sense_buffer allocated beyond scsi_cmnd from the one
kmem_cache; but that might waste more memory, and is only a way of
diverting around the known problem.

While I don't like seeing the allocation failures, and hate the idea of
all those bios piled up above a scsi host working one by one, it does
seem to emerge fairly soon with the livelock fix.  So lacking better
ideas, stick with that one clear fix for now.

Signed-off-by: Hugh Dickins <>
Cc: James Bottomley <>
Cc: Andrew Morton <>
Cc: FUJITA Tomonori <>
Cc: Jens Axboe <>
Cc: Christoph Lameter <>
Cc: Pekka Enberg <>
Cc: Peter Zijlstra <>
Cc: Rafael J. Wysocki <>
Signed-off-by: Linus Torvalds <>
14 years agoV4L/DVB (7497): pvrusb2: add new usb pid for 73xxx models
Michael Krufky [Sun, 16 Mar 2008 02:59:29 +0000 (23:59 -0300)]
V4L/DVB (7497): pvrusb2: add new usb pid for 73xxx models

Signed-off-by: Michael Krufky <>
Signed-off-by: Mauro Carvalho Chehab <>
14 years agoV4L/DVB (7496): pvrusb2: add new usb pid for 75xxx models
Michael Krufky [Sat, 8 Mar 2008 09:07:38 +0000 (06:07 -0300)]
V4L/DVB (7496): pvrusb2: add new usb pid for 75xxx models

Signed-off-by: Michael Krufky <>
Signed-off-by: Mauro Carvalho Chehab <>
14 years agoV4L/DVB (7499): v4l/dvb Kconfig: Fix bugzilla #10067
Mauro Carvalho Chehab [Thu, 3 Apr 2008 23:08:04 +0000 (20:08 -0300)]
V4L/DVB (7499): v4l/dvb Kconfig: Fix bugzilla #10067

tda8290 breaks if tuner is selected, but CONFIG_DVB=n.

Signed-off-by: Mauro Carvalho Chehab <>
14 years agoV4L/DVB (7495): s5h1409: fix blown-away bit in function s5h1409_set_gpio
Michael Krufky [Thu, 3 Apr 2008 01:14:41 +0000 (22:14 -0300)]
V4L/DVB (7495): s5h1409: fix blown-away bit in function s5h1409_set_gpio

Preserve all other bits when setting gpio.

Signed-off-by: Michael Krufky <>
Signed-off-by: Steven Toth <>
Signed-off-by: Mauro Carvalho Chehab <>
14 years agoV4L/DVB (7460): bttv: Bt832 - fix possible NULL pointer deref
Cyrill Gorcunov [Tue, 1 Apr 2008 19:48:23 +0000 (16:48 -0300)]
V4L/DVB (7460): bttv: Bt832 - fix possible NULL pointer deref

This patch does fix potential NULL pointer dereference

Signed-off-by: Cyrill Gorcunov <>
Signed-off-by: Mauro Carvalho Chehab <>
14 years ago[WATCHDOG] it8712f_wdt Zero MSB timeout byte when disabling watchdog
Andrew Paprocki [Wed, 2 Apr 2008 06:43:19 +0000 (02:43 -0400)]
[WATCHDOG] it8712f_wdt Zero MSB timeout byte when disabling watchdog

I noticed this while testing the latest code. I'm not sure if it is required,
but the normal (or LSB) timeout value is set to zero, so the MSB should
be as well to stay consistent.

If the chip revision is >= 8, set MSB of the 16-bit timeout value to zero
when disabling the watchdog in it8712f_wdt_disable().

Signed-off-by: Andrew Paprocki <>
Signed-off-by: Wim Van Sebroeck <>
Signed-off-by: Andrew Morton <>
14 years agoRevert "ACPI: Ignore _BQC object when registering backlight device"
Linus Torvalds [Sat, 5 Apr 2008 19:14:13 +0000 (12:14 -0700)]
Revert "ACPI: Ignore _BQC object when registering backlight device"

This reverts commit 7c0ea45be4f114d85ee35caeead8e1660699c46f which
caused a regression with the backlight being set to off when a laptop
doesn't have a _BQC entry to query the actual backlight value.  The code
blindly then falls back on a value of 0.


for details.

Bisected-and-reported-by: Andrey Borzenkov <>
Cc: Zhao Yakui <>
Cc: Zhang Rui <>
Cc: Len Brown <>
Signed-off-by: Linus Torvalds <>
14 years agoMerge branch 'upstream' of git://
Linus Torvalds [Fri, 4 Apr 2008 22:09:44 +0000 (15:09 -0700)]
Merge branch 'upstream' of git://git./linux/kernel/git/ralf/upstream-linus

* 'upstream' of git://
  [MIPS] Make KGDB compile on UP
  [MIPS] Pb1200: Fix header breakage

14 years agoMerge branch 'upstream-davem' of
David S. Miller [Fri, 4 Apr 2008 22:00:52 +0000 (15:00 -0700)]
Merge branch 'upstream-davem' of /linux/kernel/git/jgarzik/netdev-2.6

14 years agoipmi: change device node ordering to reflect probe order
Carol Hebert [Fri, 4 Apr 2008 21:30:03 +0000 (14:30 -0700)]
ipmi: change device node ordering to reflect probe order

In 2.6.14 a patch was merged which switching the order of the ipmi device
naming from in-order-of-discovery over to reverse-order-of-discovery.

So on systems with multiple BMC interfaces, the ipmi device names are being
created in reverse order relative to how they are discovered on the system
(e.g.  on an IBM x3950 multinode server with N nodes, the device name for the
BMC in the first node is /dev/ipmiN-1 and the device name for the BMC in the
last node is /dev/ipmi0, etc.).

The problem is caused by the list handling routines chosen in dmi_scan.c.
Using list_add() causes the multiple ipmi devices to be added to the device
list using a stack-paradigm and so the ipmi driver subsequently pulls them off
during initialization in LIFO order.  This patch changes the
dmi_save_ipmi_device() list handling paradigm to a queue, thereby allowing the
ipmi driver to build the ipmi device names in the order in which they are
found on the system.

Signed-off-by: Carol Hebert <>
Signed-off-by: Corey Minyard <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
14 years agomtd: fix broken state in CFI driver caused by FL_SHUTDOWN
Alexey Korolev [Fri, 4 Apr 2008 21:30:01 +0000 (14:30 -0700)]
mtd: fix broken state in CFI driver caused by FL_SHUTDOWN

THe CFI driver in 2.6.24 kernel is broken.  Not so intensive read/write
operations cause incomplete writes which lead to kernel panics in JFFS2.

We investigated the issue - it is caused by bug in FL_SHUTDOWN parsing code.
Sometimes chip returns -EIO as if it is in FL_SHUTDOWN state when it should
wait in FL_PONT (error in order of conditions).

The following patch fixes the bug in state parsing code of CFI.  Also I've
added comments to notify developers if they want to add new case in future.

Signed-off-by: Alexey Korolev <>
Reviewed-by: Joern Engel <>
Cc: David Woodhouse <>
Cc: <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
14 years agomemory controller: make memory resource control aware of boot options
Balbir Singh [Fri, 4 Apr 2008 21:29:59 +0000 (14:29 -0700)]
memory controller: make memory resource control aware of boot options

A boot option for the memory controller was discussed on lkml.  It is a good
idea to add it, since it saves memory for people who want to turn off the
memory controller.

By default the option is on for the following two reasons:

1. It provides compatibility with the current scheme where the memory
   controller turns on if the config option is enabled
2. It allows for wider testing of the memory controller, once the config
   option is enabled

We still allow the create, destroy callbacks to succeed, since they are not
aware of boot options.  We do not populate the directory will memory resource
controller specific files.

Signed-off-by: Balbir Singh <>
Cc: Paul Menage <>
Cc: Balbir Singh <>
Cc: Pavel Emelyanov <>
Cc: KAMEZAWA Hiroyuki <>
Cc: Hugh Dickins <>
Cc: Sudhir Kumar <>
Cc: YAMAMOTO Takashi <>
Cc: David Rientjes <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
14 years agocgroups: add cgroup support for enabling controllers at boot time
Paul Menage [Fri, 4 Apr 2008 21:29:57 +0000 (14:29 -0700)]
cgroups: add cgroup support for enabling controllers at boot time

The effects of cgroup_disable=foo are:

- foo isn't auto-mounted if you mount all cgroups in a single hierarchy
- foo isn't visible as an individually mountable subsystem

As a result there will only ever be one call to foo->create(), at init time;
all processes will stay in this group, and the group will never be mounted on
a visible hierarchy.  Any additional effects (e.g.  not allocating metadata)
are up to the foo subsystem.

This doesn't handle early_init subsystems (their "disabled" bit isn't set be,
but it could easily be extended to do so if any of the early_init systems
wanted it - I think it would just involve some nastier parameter processing
since it would occur before the command-line argument parser had been run.

Hugh said:

  Ballpark figures, I'm trying to get this question out rather than
  processing the exact numbers: CONFIG_CGROUP_MEM_RES_CTLR adds 15% overhead
  to the affected paths, booting with cgroup_disable=memory cuts that back to
  1% overhead (due to slightly bigger struct page).

  I'm no expert on distros, they may have no interest whatever in
  CONFIG_CGROUP_MEM_RES_CTLR=y; and the rest of us can easily build with or
  without it, or apply the cgroup_disable=memory patches.

Unix bench's execl test result on x86_64 was

== just after boot without mounting any cgroup fs.==
mem_cgorup=off : Execl Throughput       43.0     3150.1      732.6
mem_cgroup=on  : Execl Throughput       43.0     2932.6      682.0

[ fix boot option parsing]
Signed-off-by: Balbir Singh <>
Cc: Paul Menage <>
Cc: Balbir Singh <>
Cc: Pavel Emelyanov <>
Cc: KAMEZAWA Hiroyuki <>
Cc: Hugh Dickins <>
Cc: Sudhir Kumar <>
Cc: YAMAMOTO Takashi <>
Cc: David Rientjes <>
Signed-off-by: Li Zefan <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
14 years ago[MIPS] Make KGDB compile on UP
Sergei Shtylyov [Thu, 20 Mar 2008 17:59:34 +0000 (20:59 +0300)]
[MIPS] Make KGDB compile on UP

Building UP kernel with KGDB enabled produces the following errors and warning
(fatal due to -Werror in arch/mips/kernel/Makefile):

In file included from arch/mips/kernel/gdb-stub.c:142:
include/asm/smp.h:25:1: "raw_smp_processor_id" redefined
In file included from include/linux/sched.h:69,
                 from arch/mips/kernel/gdb-stub.c:126:
include/linux/smp.h:88:1: this is the location of the previous definition
In file included from arch/mips/kernel/gdb-stub.c:142:
include/asm/smp.h:62: error: redefinition of 'smp_send_reschedule'
include/linux/smp.h:102: error: previous definition of 'smp_send_reschedule' was here
include/asm/smp.h: In function `smp_send_reschedule':
include/asm/smp.h:65: error: dereferencing pointer to incomplete type
arch/mips/kernel/gdb-stub.c: At top level:
arch/mips/kernel/gdb-stub.c:660: warning: 'kgdb_wait' defined but not used

Fix the errors by not directly including <asm/smp.h> (which is already included
by <linux/smp.h>) and the warning by enclosing kgdb_wait() in #ifdef CONFIG_SMP.

Signed-off-by: Sergei Shtylyov <>
Signed-off-by: Ralf Baechle <>
14 years ago[MIPS] Pb1200: Fix header breakage
Sergei Shtylyov [Wed, 2 Apr 2008 19:53:19 +0000 (23:53 +0400)]
[MIPS] Pb1200: Fix header breakage

Signed-off-by: Sergei Shtylyov <>
Signed-off-by: Ralf Baechle <>
14 years agoMerge branch 'for-linus' of git://
Linus Torvalds [Fri, 4 Apr 2008 21:42:58 +0000 (14:42 -0700)]
Merge branch 'for-linus' of git://git./linux/kernel/git/x86/linux-2.6-x86

* 'for-linus' of git://
  x86: revert assign IRQs to hpet timer
  x86: tsc prevent time going backwards
  xen: Clear PG_pinned in release_{pt,pd}()
  xen: Do not pin/unpin PMD pages
  xen: refactor xen_{alloc,release}_{pt,pd}()
  x86, agpgart: scary messages are fortunately obsolete
  xen: fix grant table bug
  x86: fix breakage of vSMP irq operations
  x86: print message if nmi_watchdog=2 cannot be enabled
  x86: fix nmi_watchdog=2 on Pentium-D CPUs

14 years agom68k: update defconfigs for 2.6.25
Geert Uytterhoeven [Fri, 4 Apr 2008 12:58:42 +0000 (14:58 +0200)]
m68k: update defconfigs for 2.6.25

Long overdue update of the m68k defconfigs

Signed-off-by: Geert Uytterhoeven <>
Signed-off-by: Linus Torvalds <>
14 years agom68k: use KBUILD_DEFCONFIG
Adrian Bunk [Fri, 4 Apr 2008 12:57:38 +0000 (14:57 +0200)]

The default defconfig should be one from arch/m68k/configs/

arch/m68k/defconfig was not exactly identical to amiga_defconfig but
also considering how long they have been without any update that doesn't
seem to have been on purpose.

Signed-off-by: Adrian Bunk <>
Signed-off-by: Geert Uytterhoeven <>
Signed-off-by: Linus Torvalds <>
14 years agoMerge branch 'upstream-linus' of git://
Linus Torvalds [Fri, 4 Apr 2008 21:40:04 +0000 (14:40 -0700)]
Merge branch 'upstream-linus' of git://git./linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://
  pata_ali: disable ATAPI DMA
  libata: ATA_12/16 doesn't fall into ATAPI_MISC
  libata: uninline atapi_cmd_type()
  libata: fix IDENTIFY order in ata_bus_probe()

14 years agoBe more careful about marking buffers dirty
Linus Torvalds [Fri, 4 Apr 2008 21:38:17 +0000 (14:38 -0700)]
Be more careful about marking buffers dirty

Mikulas Patocka noted that the optimization where we check if a buffer
was already dirty (and we avoid re-dirtying it) was not really SMP-safe.

Since the read of the old status was not synchronized with anything, an
aggressive CPU re-ordering of memory accesses might have moved that read
up to before the data was even written to the buffer, and another CPU
that cleaned it again, causing the newly dirty state to never actually
hit the disk.

Admittedly this would probably never trigger in practice, but it's still

Mikulas sent a patch that fixed the problem, but I dislike the subtlety
of the whole optimization, so this is an alternate fix that is more
explicit about the particular SMP ordering for the optimization, and
separates out the speculative reads of the buffer state into its own
conditional (and makes the memory barrier only happen if we are likely
to actually hit the optimized case in the first place).

I considered removing the optimization entirely, but Andrew argued for
it's continued existence. I'm a push-over.

Cc: Mikulas Patocka <>
Cc: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
14 years agoparport_pc: make sure to release IO ports after probing for IT87XX
Linus Torvalds [Fri, 4 Apr 2008 21:30:31 +0000 (14:30 -0700)]
parport_pc: make sure to release IO ports after probing for IT87XX

Commit f63fd7e299ee13da071ecfce2b90b58c5e1562b1 ("parport_pc: detection
for SuperIO IT87XX POST") only released the IO port region on success,
not when the probe for the IT87XX chip failed.

That caused not only a reserved region to leak, but also caused an oops
when the driver module was unloaded and somebody tried to cat
/proc/ioports - because the string that was assigned to the IO port
region was a static string in the module virtual address area.

Reported-by: Lubos Lunak <>
Cc: Jan Kara <>
Cc: Petr Cvek <>
Acked-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
14 years agofix endian lossage in forcedeth
Al Viro [Wed, 26 Mar 2008 05:57:12 +0000 (05:57 +0000)]
fix endian lossage in forcedeth

a) if you initialize something with le32_to_cpu(...), then |= it
with host-endian and feed to cpu_to_le32(), it's most definitely
*not* __le32.  As sparse would've told you...

b) the whole sequence is |= cpu_to_le32(host-endian constant)

Signed-off-by: Al Viro <>
Signed-off-by: Jeff Garzik <>
14 years agonet/tokenring/olympic.c section fixes
Adrian Bunk [Sun, 30 Mar 2008 22:40:04 +0000 (01:40 +0300)]
net/tokenring/olympic.c section fixes

My previous section fix only turned one section problem into another
section problem.

This patch fixes it for real.

Signed-off-by: Adrian Bunk <>
Signed-off-by: Jeff Garzik <>
14 years agonet: marvell.c fix sparse shadowed variable warning
Harvey Harrison [Thu, 3 Apr 2008 00:33:35 +0000 (17:33 -0700)]
net: marvell.c fix sparse shadowed variable warning

The other if blocks don't redeclare temp, remove the redeclaration in
the final if() block.

drivers/net/phy/marvell.c:214:7: warning: symbol 'temp' shadows an earlier one
drivers/net/phy/marvell.c:160:6: originally declared here

Signed-off-by: Harvey Harrison <>
Signed-off-by: Jeff Garzik <>
14 years ago[VLAN]: Fix egress priority mappings leak.
Pavel Emelyanov [Fri, 4 Apr 2008 19:45:12 +0000 (12:45 -0700)]
[VLAN]: Fix egress priority mappings leak.

These entries are allocated in vlan_dev_set_egress_priority,
but are never released and leaks on vlan device removal.

Drop these in vlan's ->uninit callback - after the device is
brought down and everyone is notified about it is going to
be unregistered.

Found during testing vlan netnsization patchset.

Signed-off-by: Pavel Emelyanov <>
Acked-by: Patrick McHardy <>
Signed-off-by: David S. Miller <>
14 years agox86: revert assign IRQs to hpet timer
Thomas Gleixner [Fri, 4 Apr 2008 14:26:10 +0000 (16:26 +0200)]
x86: revert assign IRQs to hpet timer

The commits:

commit 37a47db8d7f0f38dac5acf5a13abbc8f401707fa
Author: Balaji Rao <>
Date:   Wed Jan 30 13:30:03 2008 +0100

    x86: assign IRQs to HPET timers, fix


commit e3f37a54f690d3e64995ea7ecea08c5ab3070faf
Author: Balaji Rao <>
Date:   Wed Jan 30 13:30:03 2008 +0100

    x86: assign IRQs to HPET timers

have been identified to cause a regression on some platforms due to
the assignement of legacy IRQs which makes the legacy devices
connected to those IRQs disfunctional.

Revert them.

This fixes

Signed-off-by: Thomas Gleixner <>
Signed-off-by: Ingo Molnar <>
14 years agox86: tsc prevent time going backwards
Thomas Gleixner [Tue, 1 Apr 2008 17:45:18 +0000 (19:45 +0200)]
x86: tsc prevent time going backwards

We already catch most of the TSC problems by sanity checks, but there
is a subtle bug which has been in the code for ever. This can cause
time jumps in the range of hours.

This was reported in:

I was able to reproduce the problem with a gettimeofday loop test on a
dual core and a quad core machine which both have sychronized
TSCs. The TSCs seems not to be perfectly in sync though, but the
kernel is not able to detect the slight delta in the sync check. Still
there exists an extremly small window where this delta can be observed
with a real big time jump. So far I was only able to reproduce this
with the vsyscall gettimeofday implementation, but in theory this
might be observable with the syscall based version as well.

CPU 0 updates the clock source variables under xtime/vyscall lock and
CPU1, where the TSC is slighty behind CPU0, is reading the time right
after the seqlock was unlocked.

The clocksource reference data was updated with the TSC from CPU0 and
the value which is read from TSC on CPU1 is less than the reference
data. This results in a huge delta value due to the unsigned
subtraction of the TSC value and the reference value. This algorithm
can not be changed due to the support of wrapping clock sources like
pm timer.

The huge delta is converted to nanoseconds and added to xtime, which
is then observable by the caller. The next gettimeofday call on CPU1
will show the correct time again as now the TSC has advanced above the
reference value.

To prevent this TSC specific wreckage we need to compare the TSC value
against the reference value and return the latter when it is larger
than the actual TSC value.

I pondered to mark the TSC unstable when the readout is smaller than
the reference value, but this would render an otherwise good and fast
clocksource unusable without a real good reason.

Signed-off-by: Thomas Gleixner <>
Signed-off-by: Ingo Molnar <>
14 years agoxen: Clear PG_pinned in release_{pt,pd}()
Mark McLoughlin [Wed, 2 Apr 2008 14:36:38 +0000 (15:36 +0100)]
xen: Clear PG_pinned in release_{pt,pd}()

Signed-off-by: Mark McLoughlin <>
Cc: Mark McLoughlin <>
Cc: Jeremy Fitzhardinge <>
Signed-off-by: Thomas Gleixner <>
Signed-off-by: Ingo Molnar <>
14 years agoxen: Do not pin/unpin PMD pages
Mark McLoughlin [Wed, 2 Apr 2008 14:36:37 +0000 (15:36 +0100)]
xen: Do not pin/unpin PMD pages

i.e. with this simple test case:

    int fd = open("/dev/zero", O_RDONLY);
    munmap(mmap((void *)0x40000000, 0x1000_LEN, PROT_READ, MAP_PRIVATE, fd, 0), 0x1000);

we currently get:

   kernel BUG at arch/x86/xen/enlighten.c:678!
   EIP is at xen_release_pt+0x79/0xa9
   Call Trace:
    [<c041da25>] ? __pmd_free_tlb+0x1a/0x75
    [<c047a192>] ? free_pgd_range+0x1d2/0x2b5
    [<c047a2f3>] ? free_pgtables+0x7e/0x93
    [<c047b272>] ? unmap_region+0xb9/0xf5
    [<c047c1bd>] ? do_munmap+0x193/0x1f5
    [<c047c24f>] ? sys_munmap+0x30/0x3f
    [<c0408cce>] ? syscall_call+0x7/0xb

and xen complains:

  (XEN) mm.c:2241:d4 Mfn 1cc37 not pinned

Further details at:

Signed-off-by: Mark McLoughlin <>
Cc: Mark McLoughlin <>
Cc: Jeremy Fitzhardinge <>
Signed-off-by: Thomas Gleixner <>
Signed-off-by: Ingo Molnar <>
14 years agoxen: refactor xen_{alloc,release}_{pt,pd}()
Mark McLoughlin [Wed, 2 Apr 2008 14:36:36 +0000 (15:36 +0100)]
xen: refactor xen_{alloc,release}_{pt,pd}()

Signed-off-by: Mark McLoughlin <>
Cc: Mark McLoughlin <>
Cc: Jeremy Fitzhardinge <>
Signed-off-by: Thomas Gleixner <>
Signed-off-by: Ingo Molnar <>
14 years agox86, agpgart: scary messages are fortunately obsolete
Pavel Machek [Tue, 1 Apr 2008 12:24:03 +0000 (14:24 +0200)]
x86, agpgart: scary messages are fortunately obsolete

Fix obsolete printks in aperture-64. We used not to handle missing
agpgart, but we handle it okay now.

Signed-off-by: Pavel Machek <>
Signed-off-by: Ingo Molnar <>
14 years agoxen: fix grant table bug
Michael Abd-El-Malek [Fri, 4 Apr 2008 09:33:48 +0000 (02:33 -0700)]
xen: fix grant table bug

fix memory corruption and crash due to mis-sized grant table.

A PV OS has two grant table data structures: the grant table itself
and a free list.  The free list is composed of an array of pages,
which grow dynamically as the guest OS requires more grants.  While
the grant table contains 8-byte entries, the free list contains 4-byte
entries.  So we have half as many pages in the free list than in the
grant table.

There was a bug in the free list allocation code. The free list was
indexed as if it was the same size as the grant table.  But it's only
half as large.  So memory got corrupted, and I was seeing crashes in
the slab allocator later on.

Taken from:

Signed-off-by: Michael Abd-El-Malek <>
Signed-off-by: Mark McLoughlin <>
Signed-off-by: Jeremy Fitzhardinge <>
Signed-off-by: Ingo Molnar <>
14 years agox86: fix breakage of vSMP irq operations
Ravikiran G Thirumalai [Fri, 4 Apr 2008 10:06:29 +0000 (03:06 -0700)]
x86: fix breakage of vSMP irq operations

25-rc* stopped working with CONFIG_X86_VSMP on vSMP machines.

Looks like the vsmp irq ops got accidentally removed during merge of x86_64
pvops in 2.6.25. -- commit 6abcd98ffafbff81f0bfd7ee1d129e634af13245 removed
vsmp irq ops.

Tested with both CONFIG_X86_VSMP and without CONFIG_X86_VSMP, on vSMP and non
vSMP x86_64 machines.

Please apply.

Signed-off-by: Ravikiran Thirumalai <>
Signed-off-by: Ingo Molnar <>
14 years agox86: print message if nmi_watchdog=2 cannot be enabled
Ingo Molnar [Thu, 27 Mar 2008 22:39:42 +0000 (23:39 +0100)]
x86: print message if nmi_watchdog=2 cannot be enabled

right now if there's no CPU support for nmi_watchdog=2 we'll just
refuse it silently.

print a useful warning.

Signed-off-by: Ingo Molnar <>
14 years agox86: fix nmi_watchdog=2 on Pentium-D CPUs
Ingo Molnar [Thu, 27 Mar 2008 22:37:58 +0000 (23:37 +0100)]
x86: fix nmi_watchdog=2 on Pentium-D CPUs

implement nmi_watchdog=2 on this class of CPUs:

  cpu family      : 15
  model           : 6
  model name      : Intel(R) Pentium(R) D CPU 3.00GHz

the watchdog's ->setup() method is safe anyway, so if the CPU
cannot support it we'll bail out safely.

Signed-off-by: Ingo Molnar <>
14 years agopata_ali: disable ATAPI DMA
Tejun Heo [Thu, 3 Apr 2008 05:40:55 +0000 (14:40 +0900)]
pata_ali: disable ATAPI DMA

ATAPI DMA just doesn't work reliably on pata_ali.  The IDE driver can
do it but for some mysterious reason, pata_ali can't.  This patch
disables it by default and makes the driver whine during
initialization.  "pata_ali.atapi_dma" parameter is added so that user
can bypass the workaround.

Signed-off-by: Tejun Heo <>
Signed-off-by: Jeff Garzik <>
14 years agolibata: ATA_12/16 doesn't fall into ATAPI_MISC
Tejun Heo [Wed, 2 Apr 2008 08:35:19 +0000 (17:35 +0900)]
libata: ATA_12/16 doesn't fall into ATAPI_MISC

SAT passthrus don't really fit into ATAPI_MISC class.  SAT passthru
commands always transfer multiple of 512 bytes and variable length
response is not allowed.  This patch creates a separate category -
ATAPI_PASS_THRU - for these.

This fixes HSM violation on "hdparm -I".

Signed-off-by: Tejun Heo <>
Signed-off-by: Jeff Garzik <>
14 years agolibata: uninline atapi_cmd_type()
Tejun Heo [Wed, 2 Apr 2008 08:28:46 +0000 (17:28 +0900)]
libata: uninline atapi_cmd_type()

Uninline atapi_cmd_type().  It doesn't really have to be inline and
more case will be added which need to access unexported libata

Signed-off-by: Tejun Heo <>
Signed-off-by: Jeff Garzik <>
14 years agolibata: fix IDENTIFY order in ata_bus_probe()
Bartlomiej Zolnierkiewicz [Wed, 2 Apr 2008 01:35:15 +0000 (10:35 +0900)]
libata: fix IDENTIFY order in ata_bus_probe()

Commit f58229f8060055b08b34008ea08f31de1e2f003c accidentally made
ata_bus_probe() not use reverse order probing.  Fix it.

There currently isn't any PATA driver which uses obsolete
ata_bus_probe() path, so this patch is mainly for correctness.

Signed-off-by: Bartlomiej Zolnierkiewicz <>
Signed-off-by: Tejun Heo <>
Signed-off-by: Jeff Garzik <>
14 years ago[TG3]: Add PHY workaround for 5784
Matt Carlson [Fri, 4 Apr 2008 04:44:44 +0000 (21:44 -0700)]
[TG3]: Add PHY workaround for 5784

The 5784 B step and newer chips require the PHY DSPs to be fine-tuned
based on one-time programmable values stored in the chip.  This is
essential to achieve optimal PHY operations especially when using
long cables.  We also need to properly handle the 10Mbit RX bit in the
CPMU_CTRL register during PHY reset.

Update version to 3.89.

Signed-off-by: Matt Carlson <>
Signed-off-by: Michael Chan <>
Signed-off-by: David S. Miller <>
14 years ago[SPARC64]: Fix user accesses in regset code.
David S. Miller [Thu, 3 Apr 2008 23:55:14 +0000 (16:55 -0700)]
[SPARC64]: Fix user accesses in regset code.

If target is not current we need to use access_process_vm().

Noticed by Roland McGrath.

Signed-off-by: David S. Miller <>
14 years agoMerge branch 'for-linus' of git://
Linus Torvalds [Thu, 3 Apr 2008 23:28:57 +0000 (16:28 -0700)]
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/selinux-2.6

* 'for-linus' of git://
  selinux: prevent rentry into the FS

14 years agox86 ptrace: avoid unnecessary wrmsr
Roland McGrath [Thu, 3 Apr 2008 21:18:55 +0000 (14:18 -0700)]
x86 ptrace: avoid unnecessary wrmsr

This avoids using wrmsr on MSR_IA32_DEBUGCTLMSR when it's not needed.
No wrmsr ever needs to be done if noone has ever used block stepping.

Without this change, using ptrace on 2.6.25 on an x86 KVM guest
will tickle KVM's missing support for the MSR and crash the guest
kernel.  Though host KVM is the buggy one, this makes for a regression
in the guest behavior from 2.6.24->2.6.25 that we can easily avoid.

I also corrected some bad whitespace.

Signed-off-by: Roland McGrath <>
Cc: Ingo Molnar <>
Cc: Thomas Gleixner <>
Signed-off-by: Linus Torvalds <>
14 years agoMerge branch 'for-linus' of git://
Linus Torvalds [Thu, 3 Apr 2008 22:41:32 +0000 (15:41 -0700)]
Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

* 'for-linus' of git://
  Input: appletouch - add product IDs for the 4th generation MacBooks

14 years agoMerge branch 'merge' of git://
Linus Torvalds [Thu, 3 Apr 2008 22:41:10 +0000 (15:41 -0700)]
Merge branch 'merge' of git://git./linux/kernel/git/paulus/powerpc

* 'merge' of git://
  [POWERPC] Fix MPC5200 (not B!) device tree so FEC ethernet works
  [POWERPC] mpc5200: Amalgamated DTS fixes and updates
  [POWERPC] Fix rtas_flash procfs interface
  [POWERPC] Fix deadlock with mmu_hash_lock in hash_page_sync
  [POWERPC] Fix iSeries hard irq enabling regression
  [POWERPC] Fix CPM2 SCC1 clock initialization.
  [POWERPC] Fix defconfigs so we dont set both GENRTC and RTCLIB
  [POWERPC] fsldma: Use compatiable binding as spec
  [POWERPC] sata_fsl: reduce compatibility to fsl,pq-sata
  [POWERPC] 83xx: enable usb in 837x rdb and 83xx defconfigs
  [POWERPC] 83xx: Fix wrong USB phy type in mpc837xrdb dts

14 years agorxrpc: remove smp_processor_id() from debug macro
Sven Schnelle [Thu, 3 Apr 2008 09:45:30 +0000 (10:45 +0100)]
rxrpc: remove smp_processor_id() from debug macro

Signed-off-by: Sven Schnelle <>
Signed-off-by: David Howells <>
Signed-off-by: Linus Torvalds <>
14 years agoafs: remove smp_prcessor_id() from debug macro
Sven Schnelle [Thu, 3 Apr 2008 09:44:01 +0000 (10:44 +0100)]
afs: remove smp_prcessor_id() from debug macro

Signed-off-by: Sven Schnelle <>
Signed-off-by: David Howells <>
Signed-off-by: Linus Torvalds <>
14 years agosplice: use mapping_gfp_mask
Hugh Dickins [Thu, 3 Apr 2008 22:35:22 +0000 (23:35 +0100)]
splice: use mapping_gfp_mask

The loop block driver is careful to mask __GFP_IO|__GFP_FS out of its
mapping_gfp_mask, to avoid hangs under memory pressure.  But nowadays
it uses splice, usually going through __generic_file_splice_read.  That
must use mapping_gfp_mask instead of GFP_KERNEL to avoid those hangs.

Signed-off-by: Hugh Dickins <>
Cc: Jens Axboe <>
Cc: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
14 years agoselinux: prevent rentry into the FS
Josef Bacik [Thu, 3 Apr 2008 22:35:05 +0000 (09:35 +1100)]
selinux: prevent rentry into the FS

BUG fix.  Keep us from re-entering the fs when we aren't supposed to.

See discussion at

Signed-off-by: Josef Bacik <>
Acked-by: Stephen Smalley <>
Signed-off-by: James Morris <>
14 years ago[SPARC64]: Fix FPU saving in 64-bit signal handling.
David S. Miller [Thu, 3 Apr 2008 22:07:24 +0000 (15:07 -0700)]
[SPARC64]: Fix FPU saving in 64-bit signal handling.

The calculation of the FPU reg save area pointer
was wrong.

Based upon an OOPS report from Tom Callaway.

Signed-off-by: David S. Miller <>
14 years ago[NET]: srandom32 fixes for networking v2
Andi Kleen [Thu, 3 Apr 2008 21:07:02 +0000 (14:07 -0700)]
[NET]: srandom32 fixes for networking v2

- Let it update the state of all CPUs. The network stack goes
into pains to feed the current IP addresses in, but it is not very
effective if that is only done for some random CPU instead of all.
So change it to feed bits into all CPUs.  I decided to do that lockless
because well somewhat random results are ok.

v2: Drop rename so that this patch doesn't depend on x86 maintainers

Signed-off-by: Andi Kleen <>
Signed-off-by: David S. Miller <>
14 years ago[IPV6]: Fix refcounting for anycast dst entries.
Denis V. Lunev [Thu, 3 Apr 2008 20:33:00 +0000 (13:33 -0700)]
[IPV6]: Fix refcounting for anycast dst entries.

Anycast DST entries allocated inside ipv6_dev_ac_inc are leaked when
network device is stopped without removing IPv6 addresses from it. The
bug has been observed in the reality on 2.6.18-rhel5 kernel.

In the above case addrconf_ifdown marks all entries as obsolete and
ip6_del_rt called from __ipv6_dev_ac_dec returns ENOENT. The
referrence is not dropped.

The fix is simple. DST entry should not keep referrence when stored in
the FIB6 tree.

Signed-off-by: Denis V. Lunev <>
Signed-off-by: David S. Miller <>
14 years ago[IPV6]: inet6_dev on loopback should be kept until namespace stop.
Denis V. Lunev [Thu, 3 Apr 2008 20:31:53 +0000 (13:31 -0700)]
[IPV6]: inet6_dev on loopback should be kept until namespace stop.

In the other case it will be destroyed when last address will be removed
from lo inside a namespace. This will break IPv6 in several places. The
most obvious one is ip6_dst_ifdown.

Signed-off-by: Denis V. Lunev <>
Signed-off-by: David S. Miller <>
14 years ago[IPV6]: Event type in addrconf_ifdown is mis-used.
Denis V. Lunev [Thu, 3 Apr 2008 20:30:17 +0000 (13:30 -0700)]
[IPV6]: Event type in addrconf_ifdown is mis-used.

addrconf_ifdown is broken in respect to the usage of how
parameter. This function is called with (event != NETDEV_DOWN) and (2)
on the IPv6 stop.  It the latter case inet6_dev from loopback device
should be destroyed.

Signed-off-by: Denis V. Lunev <>
Signed-off-by: David S. Miller <>
14 years ago[ICMP]: Ensure that ICMP relookup maintains status quo
Herbert Xu [Thu, 3 Apr 2008 19:52:19 +0000 (12:52 -0700)]
[ICMP]: Ensure that ICMP relookup maintains status quo

The ICMP relookup path is only meant to modify behaviour when
appropriate IPsec policies are in place and marked as requiring
relookups.  It is certainly not meant to modify behaviour when
IPsec policies don't exist at all.

However, due to an oversight on the error paths existing behaviour
may in fact change should one of the relookup steps fail.

This patch corrects this by redirecting all errors on relookup
failures to the previous code path.  That is, if the initial
xfrm_lookup let the packet pass, we will stand by that decision
should the relookup fail due to an error.

This should be safe from a security point-of-view because compliant
systems must install a default deny policy so the packet would'nt
have passed in that case.

Many thanks to Julian Anastasov for pointing out this error.

Signed-off-by: Herbert Xu <>
Signed-off-by: David S. Miller <>
14 years ago[POWERPC] Fix MPC5200 (not B!) device tree so FEC ethernet works
René Bürgel [Thu, 3 Apr 2008 08:58:37 +0000 (19:58 +1100)]
[POWERPC] Fix MPC5200 (not B!) device tree so FEC ethernet works

This gets the FEC ethernet driver working again on the lite5200

The FEC driver is also compatible with the MPC5200, not only with the
MPC5200B, so this adds a suitable entry to the driver's match list.
Furthermore this adds the settings for the PHY in the dts file for the
Lite5200.  Note, that this is not exactly the same as in the
Lite5200B, because the PHY is located at f0003000:01 for the 5200, and
at :00 for the 5200B.  This was tested on a Lite5200 and a Lite5200B,
both booted a kernel via tftp and mounted the root via nfs

Signed-off-by: René Bürgel <>
Acked-by: Grant Likely <>
Signed-off-by: Paul Mackerras <>
14 years ago[POWERPC] mpc5200: Amalgamated DTS fixes and updates
Bartlomiej Sieka [Wed, 2 Apr 2008 14:26:02 +0000 (01:26 +1100)]
[POWERPC] mpc5200: Amalgamated DTS fixes and updates

DTS updates that fix booting problems on mpc5200-based boards:
- change to ethernet reg property
- addition of mdio and phy nodes
- removal of pci node (Motion-Pro board)

Other DTS updates:
- update i2c device tree nodes
- add lpb bus node and flash device (without partitions defined)
- add rtc i2c nodes

Signed-off-by: Marian Balakowicz <>
Acked-by: Grant Likely <>
Signed-off-by: Paul Mackerras <>
14 years ago[POWERPC] Fix rtas_flash procfs interface
Maxim Shchetynin [Tue, 1 Apr 2008 13:12:20 +0000 (00:12 +1100)]
[POWERPC] Fix rtas_flash procfs interface

Handling of the proc_dir_entry->count was changed in 2.6.24-rc5.
After this change, the default value for pde->count is 1 and not 0 as
before.  Therefore, if we want to check whether our procfs file is
already opened (already in use), we have to check if pde->count is
greater than 2 rather than 1.

Signed-off-by: Maxim Shchetynin <>
Signed-off-by: Jens Osterkamp <>
Signed-off-by: Paul Mackerras <>
14 years ago[POWERPC] Fix deadlock with mmu_hash_lock in hash_page_sync
Benjamin Herrenschmidt [Sun, 30 Mar 2008 20:49:27 +0000 (07:49 +1100)]
[POWERPC] Fix deadlock with mmu_hash_lock in hash_page_sync

hash_page_sync() takes and releases the low level mmu hash
lock in order to sync with other processors disposing of page
tables.  Because that lock can be needed to service hash misses
triggered by interrupt handlers, taking it must be done with
interrupts off.  However, hash_page_sync() appears to be called
with interrupts enabled, thus causing occasional deadlocks.

We fix it by making sure hash_page_sync() masks interrupts while
holding the lock.

Signed-off-by: Benjamin Herrenschmidt <>
Signed-off-by: Paul Mackerras <>
14 years ago[POWERPC] Fix iSeries hard irq enabling regression
Benjamin Herrenschmidt [Wed, 2 Apr 2008 04:58:40 +0000 (15:58 +1100)]
[POWERPC] Fix iSeries hard irq enabling regression

A subtle bug sneaked into iSeries recently.  On this platform, we must
not normally clear MSR:EE (the hardware external interrupt enable)
except for short periods of time.  Taking an interrupt while
soft-disabled doesn't cause us to clear it for example.

The iSeries kernel expects to mostly run with MSR:EE enabled at all
times except in a few exception entry/exit code paths.  Thus
local_irq_enable() doesn't check if it needs to hard-enable as it
expects this to be unnecessary on iSeries.

However, hard_irq_disable() _does_ cause MSR:EE to be cleared,
including on iSeries.  A call to it was recently added to the
context switch code, thus causing interrupts to become disabled
for a long periods of time, causing the iSeries watchdog to kick
in under some circumstances and other nasty things.

This patch fixes it by making local_irq_enable() properly re-enable
MSR:EE on iSeries.  It basically removes a return statement here
to make iSeries use the same code path as everybody else.  That does
mean that we might occasionally get spurious decrementer interrupts
but I don't think that matters.

Another option would have been to make hard_irq_disable() a nop
on iSeries but I didn't like it much, in case we have good reasons
to hard-disable.

Part of the patch is fixes to make sure the hard_enabled PACA field
is properly set on iSeries as it used not to be before, since it
was mostly unused.

Signed-off-by: Benjamin Herrenschmidt <>
Signed-off-by: Paul Mackerras <>
14 years ago[POWERPC] Fix CPM2 SCC1 clock initialization.
Laurent Pinchart [Wed, 2 Apr 2008 14:46:31 +0000 (16:46 +0200)]
[POWERPC] Fix CPM2 SCC1 clock initialization.

A missing break statement in a switch caused cpm2_clk_setup() to initialize
SCC2 instead of SCC1.

Signed-off-by: Laurent Pinchart <>
Signed-off-by: Kumar Gala <>
14 years agoMerge git://
Linus Torvalds [Wed, 2 Apr 2008 22:56:18 +0000 (15:56 -0700)]
Merge git://git./linux/kernel/git/gregkh/usb-2.6

* git://
  USB: ohci: fix 2 timers to fire at jiffies + 1s
  USB: Allow initialization of broken keyspan serial adapters.
  USB: fix bug in sg initialization in usbtest
  USB: serial: fix regression in Visor/Palm OS module for kernels >= 2.6.24
  USB: cp2101: Add identifiers for the Telegesys ETRX2USB
  USB: serial: ti_usb_3410_5052: Correct TUSB3410 endpoint requirements.
  USB: another ehci_iaa_watchdog fix

14 years agoalpha: get_current(): don't add zero to current_thread_info()->task
Andrew Morton [Wed, 2 Apr 2008 20:04:52 +0000 (13:04 -0700)]
alpha: get_current(): don't add zero to current_thread_info()->task

A nasty compile error:

In file included from security/keys/internal.h:16,
                 from security/keys/sysctl.c:14:
include/linux/key-ui.h: In function 'key_permission':
include/linux/key-ui.h:51: error: invalid use of undefined type 'struct task_struct'

apparently the compiler has decided that it needs to know sizeof(task_struct)
so that it can add zero to a task_struct* (which is rather dumb of it).

Getting task_struct in scope in these deeply-nested headers is scary-looking,
so let's just remove the "+ 0".

Cc: David Howells <>
Cc: Richard Henderson <>
Cc: Ivan Kokshaysky <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
14 years agomarkers: use synchronize_sched()
Mathieu Desnoyers [Wed, 2 Apr 2008 20:04:51 +0000 (13:04 -0700)]
markers: use synchronize_sched()

Markers do not mix well with CONFIG_PREEMPT_RCU because it uses
preempt_disable/enable() and not rcu_read_lock/unlock for minimal
intrusiveness.  We would need call_sched and sched_barrier primitives.

Currently, the modification (connection and disconnection) of probes
from markers requires changes to the data structure done in RCU-style :
a new data structure is created, the pointer is changed atomically, a
quiescent state is reached and then the old data structure is freed.

The quiescent state is reached once all the currently running
preempt_disable regions are done running.  We use the call_rcu mechanism
to execute kfree() after such quiescent state has been reached.
However, the new CONFIG_PREEMPT_RCU version of call_rcu and rcu_barrier
does not guarantee that all preempt_disable code regions have finished,
hence the race.

The "proper" way to do this is to use rcu_read_lock/unlock, but we don't
want to use it to minimize intrusiveness on the traced system.  (we do
not want the marker code to call into much of the OS code, because it
would quickly restrict what can and cannot be instrumented, such as the

The temporary fix, until we get call_rcu_sched and rcu_barrier_sched in
mainline, is to use synchronize_sched before each call_rcu calls, so we
wait for the quiescent state in the system call code path.  It will slow
down batch marker enable/disable, but will make sure the race is gone.

Signed-off-by: Mathieu Desnoyers <>
Acked-by: Paul E. McKenney <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
14 years agovmcoreinfo: add the symbol "phys_base"
Ken'ichi Ohmichi [Wed, 2 Apr 2008 20:04:50 +0000 (13:04 -0700)]
vmcoreinfo: add the symbol "phys_base"

Fix the problem that makedumpfile sometimes fails on x86_64 machine.

This patch adds the symbol "phys_base" to a vmcoreinfo data.  The
vmcoreinfo data has the minimum debugging information only for dump
filtering.  makedumpfile (dump filtering command) gets it to distinguish
unnecessary pages, and makedumpfile creates a small dumpfile.

On x86_64 kernel which compiled with CONFIG_PHYSICAL_START=0x0 and
CONFIG_RELOCATABLE=y, makedumpfile fails like the following:

 # makedumpfile -d31 /proc/vmcore dumpfile
 The kernel version is not supported.
 The created dumpfile may be incomplete.
 _exclude_free_page: Can't get next online node.

 makedumpfile Failed.

The cause is the lack of the symbol "phys_base" in a vmcoreinfo data.
If the symbol "phys_base" does not exist, makedumpfile considers an
x86_64 kernel as non relocatable.  As the result, makedumpfile
misunderstands the physical address where the kernel is loaded, and it
cannot translate a kernel virtual address to physical address correctly.

To fix this problem, this patch adds the symbol "phys_base" to a
vmcoreinfo data.

Signed-off-by: Ken'ichi Ohmichi <>
Cc: "Eric W. Biederman" <>
Cc: <>
Acked-by: Vivek Goyal <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
14 years agoefs: update error msg to not refer to deleted read_inode()
Robert P. J. Day [Wed, 2 Apr 2008 20:04:49 +0000 (13:04 -0700)]
efs: update error msg to not refer to deleted read_inode()

Signed-off-by: Robert P. J. Day <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
14 years agoChar: rio, fix sparse warnings
Jiri Slaby [Wed, 2 Apr 2008 20:04:48 +0000 (13:04 -0700)]
Char: rio, fix sparse warnings

Add some locks and unlocks to some code paths.

Signed-off-by: Jiri Slaby <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
14 years agoChar: ip2, fix sparse warnings
Jiri Slaby [Wed, 2 Apr 2008 20:04:48 +0000 (13:04 -0700)]
Char: ip2, fix sparse warnings

Unlock two grabbed locks on some paths.

Signed-off-by: Jiri Slaby <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
14 years agonbd: prevent sock_xmit from attempting to use a NULL socket
Mike Snitzer [Wed, 2 Apr 2008 20:04:47 +0000 (13:04 -0700)]
nbd: prevent sock_xmit from attempting to use a NULL socket

NBD does not protect the nbd_device's socket from becoming NULL during

This closes a race with the NBD_CLEAR_SOCK ioctl (nbd-client -d) setting
the nbd_device's socket to NULL right before NBD calls sock_xmit.

Signed-off-by: Mike Snitzer <>
Cc: Paul Clements <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
14 years agodoc: fix typo in SubmittingPatches
Jim Meyering [Wed, 2 Apr 2008 20:04:46 +0000 (13:04 -0700)]
doc: fix typo in SubmittingPatches

Signed-off-by: Jim Meyering <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
14 years agoFix typos in Documentation/unaligned-memory-access.txt
Dmitri Vorobiev [Wed, 2 Apr 2008 20:04:45 +0000 (13:04 -0700)]
Fix typos in Documentation/unaligned-memory-access.txt

This patch deletes a couple of superfluous word occurrences in the
document Documentation/unaligned-memory-access.txt.

Thanks to Sebastien Dugue for the remark about English usage.

Signed-off-by: Dmitri Vorobiev <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
14 years agoalpha: fix ALSA DMA mmap crash
Ivan Kokshaysky [Wed, 2 Apr 2008 20:04:43 +0000 (13:04 -0700)]
alpha: fix ALSA DMA mmap crash

Make dma_alloc_coherent respect gfp flags (__GFP_COMP is one that

Signed-off-by: Ivan Kokshaysky <>
Tested-by: Michael Cree <>
Cc: Richard Henderson <>
Cc: Jaroslav Kysela <>
Cc: Takashi Iwai <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
14 years agoatmel_serial: fix uart/console concurrent access
Marc Pignat [Wed, 2 Apr 2008 20:04:42 +0000 (13:04 -0700)]
atmel_serial: fix uart/console concurrent access

Strange chars appear on the serial port when a printk and a printf
happens at the same time.  This is caused by the pdc sending chars while
atmel_console_write (called from printk) is executing

Concurent access of uart and console to the same port leads to corrupted
data to be transmitted, so disable tx dma (PDC) while writing to the

Signed-off-by: Marc Pignat <>
Signed-off-by: Haavard Skinnemoen <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
14 years agoatmel_serial: avoid stopping pdc during transmission
Michael Trimarchi [Wed, 2 Apr 2008 20:04:41 +0000 (13:04 -0700)]
atmel_serial: avoid stopping pdc during transmission

I found a problem related to losing data during pdc transmission in
atmel_serial: connect ttyS1 with ttyS2 using a loopback cable, send 30
byte of packet from one to the other and waiting for 30 byte.  On the
other side just read and echo the data received.

We always call atmel_tx_dma() from the tasklet regardless of what interrupt
triggered it.

Signed-off-by: michael <>
Acked-by: Haavard Skinnemoen <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>