development kernel tree: Changes to 'andy-tracking'
git at git.openmoko.org
git at git.openmoko.org
Thu Jun 5 13:26:04 CEST 2008
Rebased ref, commits from common ancestor:
commit 495549f61ceb138ded13dcacaafc70c1feb55dfe
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 12:18:19 2008 +0100
fix-lis302dl-assert-no-wake.patch
Bad wakes from suspend due to EINT0 / motion sensor
We never set the wake mode until now :-O
Signed-off-by: Andy Green <andy at openmoko.com>
commit 8db7abd96c50afd4ee206ff4ff665e38f64f43e0
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 11:42:22 2008 +0100
config-defconfig-2.6.26.patch
Signed-off-by: Andy Green <andy at openmoko.com>
commit 64798b08adfa89fae099550c19eadb0c1669f8a9
Author: Andrzej Zaborowski <balrog at zabor.org>
Date: Thu Jun 5 10:57:02 2008 +0100
Subject: [PATCH] Hardware glamo-fb cursor, some clean-up.
commit 2590faac3cd48dba491030a2c9b902226ee41b9a
Author: Andrzej Zaborowski <balrog at zabor.org>
Date: Thu Jun 5 10:57:02 2008 +0100
Subject: [PATCH] Build fixes.
commit c299826fe7bdda9c91309fb61f7fa6b266f147ea
Author: Holger Freyther <zecke at openmoko.org>
Date: Thu Jun 5 10:57:02 2008 +0100
Make ar6k not print soooo much to my console
From 4cb4c308fde9c1f3598046ff98191d14b62bc609 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke at openmoko.org>
Date: Thu, 29 May 2008 00:09:32 +0200
Subject: [PATCH] [ar6k] silent++, removing -DDEBUG from the Makefile does not
work
commit ecd2763c71104eeeece0396c0b5d07c86976cd45
Author: Holger Freyther <zecke at openmoko.org>
Date: Thu Jun 5 10:57:02 2008 +0100
Fix possible null pointer dereference in s3c24xx_i2c_resume
From 0b9bae6aed5268707b348e48a01411ba420844e1 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke at openmoko.org>
Date: Tue, 27 May 2008 14:41:35 +0200
Subject: [PATCH] [janitor] Fix possible null pointer dereference
Judging by the control flow of the resume method i2c->suspended++ could
lead to a null pointer dereference.
commit 9c0847507ab3a524059539e1f6ecf7431d3ace68
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 10:57:02 2008 +0100
fix-remove-unused-model-name-bq27000.patch
Model name isn't in the bq27000 register set, remove the
claim that we can deliver it
Signed-off-by: Andy Green <andy at openmoko.com>
commit b5303dfb172ac49a4a8c80edf39babe910b06325
Author: Andy Green <andy at opennoko.com>
Date: Thu Jun 5 10:57:02 2008 +0100
uplevel-samsung-camera-unit.patch
Update this old code to clk API, I2C changes, official GPIO API
various struct changes, explicit readl() writel(), DMA API changes.
Still not ready for actual use (eg, I2C) but a LOT closer.
Compiles on 2.6.24 without errors or warnings now.
Use CONFIG_S3C2440_CAMERA=y in .config
Signed-off-by: Andy Green <andy at openmoko.com>
commit 893eef557e7da7be797cef01e4175f2b5fe5b9b8
Author: SW.LEE <hitchcar at samsung.com>
Date: Thu Jun 5 10:57:02 2008 +0100
introduce-samsung-camera-unit-driver.patch
This is the kernel side of an old (2004) samsung camera driver for 2440
It doesn't compile on modern kernel yet, this patch introduces it into the
kernel tree without gross mods, so it is broken code we can start to work on
commit e4c3e15db89a63c7a4b80076f802a3faf63206fb
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 10:57:02 2008 +0100
add-gta01-resume-sysfs.patch
Adds the somewhat simpler resume source support for GTA01
since PMU is not a wake source
Signed-off-by: Andy Green <andy at openmoko.com>
commit 53679387e47f349ca7afe5b25e918a72568692be
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 10:57:02 2008 +0100
fix-reduce-wake-reasons-in-pcf50633.patch
Currently we are willing to wake from sleep from
pcf50633 interrupts we don't actually do anything about
even when we wake (somewhat puzzled).
Let's disable some of these wake sources.
Signed-off-by: Andy Green <andy at openmoko.com>
commit 78fa55afb3fe345bf8857904b144942834a54463
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 10:57:01 2008 +0100
add-resume-reason-sysfs.patch
If you have U-Boot with uboot-add-find-wake-reason.patch, this
patch will get you a wake reason report from
cat /sys/devices/platform/neo1973-resume.0/resume_reason
it looks like this:
EINT00_ACCEL1
EINT01_GSM
EINT02_BLUETOOTH
EINT03_DEBUGBRD
EINT04_JACK
EINT05_WLAN
EINT06_AUXKEY
EINT07_HOLDKEY
EINT08_ACCEL2
* EINT09_PMU
adpins
adprem
usbins
usbrem
rtcalarm
second
onkeyr
onkeyf
exton1r
exton1f
exton2r
exton2f
exton3r
exton3f
* batfull
chghalt
thlimon
thlimoff
usblimon
usblimoff
adcrdy
onkey1s
lowsys
lowbat
hightmp
autopwrfail
dwn1pwrfail
dwn2pwrfail
ledpwrfail
ledovp
ldo1pwrfail
ldo2pwrfail
ldo3pwrfail
ldo4pwrfail
ldo5pwrfail
ldo6pwrfail
hcidopwrfail
hcidoovl
EINT10_NULL
EINT11_NULL
EINT12_GLAMO
EINT13_NULL
EINT14_NULL
EINT15_NULL
This shows a problem, false wake from suspend due to battery full
Signed-off-by: Andy Green <andy at openmoko.com>
commit a82623085503ae823281eb0588e23ba4c46aaa01
Author: warmcat <andy at warmcat.com>
Date: Thu Jun 5 10:56:47 2008 +0100
add-lis302dl-suspend-wake-mode.patch
Signed-off-by: Andy Green <andy at openmoko.com>
commit 93f5ed8f5df2e345d440e09b5f874e127473f53b
Author: Andy Green <agreen at localhost.localdomain>
Date: Thu Jun 5 10:37:29 2008 +0100
fix-motion-sensor-corruption.patch
commit cdba8aaa7dc3372b5fa0a089438bf237f76797e1
Author: Holger Freyther <zecke at openmoko.org>
Date: Thu Jun 5 10:37:29 2008 +0100
Fixup hang on resume caused by the s3c2410 touch screen driver
From dc6d335b467646d802a21ea6b925ee97e83e07be Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke at openmoko.org>
Date: Thu, 15 May 2008 01:16:23 +0200
Subject: [PATCH] Do not use msleep in the resume path of s3c2410_ts as it
might lockup
For some reason msleep might set the only task running into a suspended
state and no timer will ever wake it up. Use mdelay to avoid this. I was not
able to understand the reasoning of sleeping after enabling the clock. So we
might just remove the msleep/mdelay at all and be fine.
Signed-Off-By: Holger Freyther <zecke at openmoko.org>
commit d5bd53c60313deea41cfe7edf26441534f3c1ae8
Author: Sean McNeil <sean at mcneil.com>
Date: Thu Jun 5 10:37:29 2008 +0100
fix-wep-needs-keys-before-ap.patch
Signed-off-by: Andy Green <andy at openmoko.com>
commit ff99c0315c28bc3587d607f2aef3d3170145a12e
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 10:37:29 2008 +0100
fix-suspend-backlight-timing-pm-debug.patch
This patch improves the smoothness of suspend and resume action.
Taking out CONFIG_PM_DEBUG allows much more rapid resume (the low level
serial traffic appears to be synchronous)
Added a platform callback in jbt driver and support in pcf50633 so we
can defer bringing up the backlight until the LCM is able to process
video again (which must happen after the glamo is up and producing
video beacuse the LCM is hooked to glamo SPI)
GTA01 should not be affected by all this as the callback will default
to null and it is on pcf50606
Signed-off-by: Andy Green <andy at openmoko.com>
commit 4d7de9af4432ee042d691dbb9c2109ad254ba197
Author: matt_hsu <matt_hsu at openmoko.org>
Date: Thu Jun 5 10:37:28 2008 +0100
s3c24xx-pwm-platform-driver.patch
This patch is to register pwm as platform driver to keep the PWM-related
config when system is in suspend/resume. This could fix the following
issue after resume:
- HDQ read timeout
- LEDs blinked abnormally(if LEDs is driven by PWM)
Signed-off-by: Matt Hsu <matt_hsu at openmoko.org>
commit 2567bf728a99c308457cc3b46f257673d5a302b9
Author: Sean McNeil <sean at mcneil.com>
Date: Thu Jun 5 10:37:28 2008 +0100
fix-KEY_PHONE-up-down-inversion.patch
the KEY_PHONE is backwards. It returns up when pushed and down when
released. The following change fixes it:
Signed-off-by: Sean McNeil <sean at mcneil.com>
commit a0f9256df975862450910f695e9e63698a052056
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 10:37:28 2008 +0100
tracking-2.6.26-rc1-sdio-pnp-changes.patch
Signed-off-by: Andy Green <andy at openmoko.com>
commit d7139924b20c97b9b67cf9177566bad986a5c05c
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 10:37:28 2008 +0100
tracking-2.6.26-rc1-remove-dupe-s3c2410_nand_update_chip.patch
Signed-off-by: Andy Green <andy at openmoko.com>
commit b1389332dac4ffc3e53e95b0cffd23505eb58034
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 10:37:28 2008 +0100
tracking-2.6.26-rc1-remove-input-dev-private-member.patch
Signed-off-by: Andy Green <andy at openmoko.com>
commit 668c3a1b9d32dea39572919fc2b7f4e213f88f3c
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 10:37:28 2008 +0100
config-update-2.6.21-rc1.patch
Signed-off-by: Andy Green <andy at openmoko.com>
commit f92c11f6ceecfd5877e081ba5e4e4d6d416fa905
Author: Andy Green <agreen at localhost.localdomain>
Date: Thu Jun 5 10:37:28 2008 +0100
clean-sdio-hcd-suspend.patch
fix trailing whitespace and function args for suspend.
Signed-off-by: Andy Green <andy at openmoko.com>
commit 60570e309bdf83b98b9a00019327b12dbd9d453b
Author: Matt Hsu <matt_hsu at openmoko.org>
Date: Thu Jun 5 10:37:28 2008 +0100
From cc08b5986dfd8d971ee46ce7045fb7863f99a92a Mon Sep 17 00:00:00 2001
Subject: [PATCH] - add suspend/resume function of s3c24xx_hcd driver
Signed-off-by: Matt Hsu <matt_hsu at openmoko.org>
commit 1230d125c977eafef20c573bcbe0a81cd6a48d1e
Author: Tim Niemeyer <reddog at mastersword.de>
Date: Thu Jun 5 10:37:28 2008 +0100
This-adds-some-debug-messages-to-the-Neo1937-sound-d.patch
Subject: [PATCH] This adds some debug messages to the Neo1937 sound driver.
Signed-off-by: Tim Niemeyer <reddog at mastersword.de>
commit 9cb3d100e17c25bfd152e59e72c535b3a264354b
Author: Reddog <reddog at mastersword.de>
Date: Thu Jun 5 10:37:27 2008 +0100
gta01-fix-resume-redo-par.patch
--> (http://bugzilla.openmoko.org/cgi-bin/bugzilla/attachment.cgi?id=595&action=view)
fix resume of fbdev BZ#79
I played a bit with the fbdev resume. With this patch the neo doesn't get this
white screen on resume from console and from X.
Signed-off-by: Reddog <reddog at mastersword.de>
commit 13671b4f95ad6c263154e170e1db6d09aba39c6c
Author: Mike Westerhof <mwester at dls.net>
Date: Thu Jun 5 10:37:27 2008 +0100
gta01-fix-jbt-platform-missing-members.patch
Created an attachment (id=594) / BZ#79
Add missing platform_data that caused the GTA01 to crash on suspend/resume
The interface to the jbt6k74 driver changed slightly; this patch adds the
missing platform_data for the GTA01. This prevents a crash while suspending.
This patch also makes some minor changes to cleanup and clarify some debug
messages.
Signed-off-by: Mike Westerhof <mwester at dls.net>
commit 6bd544a2fa028c236772f02ba8035fe83831e83e
Author: Mike Westerhof <mwester at dls.net>
Date: Thu Jun 5 10:37:27 2008 +0100
gta01-gps-power-state-resume-preserve.patch
Created an attachment (id=593) / from BZ#79
Updated patch to preserve the power state of the GPS on the GTA01
Currently the GPS is powered up after a suspend/resume occurs. This patch will
only power the GPS back up if it was powered up when the GTA01 suspended.
Signed-off-by: Mike Westerhof <mwester at dls.net>
commit d743962bc6e2330a083e95549a52fde759ec0eaa
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 10:37:27 2008 +0100
tracking-2.6.25-changed-s3c2410_dma_request-reurn.patch
s3c2410_dma_request used to return 0 for OK and something else
for error, now it returns -ve error code or +ve dma channel index + flag
Signed-off-by: Andy Green <andy at openmoko.com>
commit a27c27cdb0d61d3df9de2d8e7adbab1ce64fb2ef
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 10:37:27 2008 +0100
tracking-2.6.25-deprecated-includefile-wm8753.patch
<linux/driver.h> is just empty and is deprecated now
Signed-off-by: Andy Green <andy at openmoko.com>
commit 909b4531da302bfd2ba70b8725fbe8158b2ec68a
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 10:37:27 2008 +0100
tracking-2.6.25-upstream-s3c2410_gpio_irq2pin.patch
Holger got beaten to it on mainline, they provide a
s3c2410_gpio_irq2pin() instead of the name he used.
Signed-off-by: Andy Green <andy at openmoko.com>
commit 3d318dc73212c2d484bfe22f92ecbc41d27bfd88
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 10:37:27 2008 +0100
tracking-2.6.25-struct-bus-type-loses-devices-member.patch
I don't know what device the symlink should be linked
against on GTA01, somebody that does know needs to edit
it in where it says "FIXME"... I think the supplied method
can work OK otherwise.
Signed-off-by: Andy Green <andy at openmoko.com>
commit 7c0d99dfefa47c3f15a58bb1c3aed1925510d2a1
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 10:37:26 2008 +0100
tracking-2.6.25-input_dev-cdev-union-removed.patch
struct input_dev in include/linux/input.h used to have a union
cdev which contained the associated device struct pointer. This
got simplified out in 2.6.25, so this patch removes cdev from
our drivers that used it before.
Signed-off-by: Andy Green <andy at openmoko.com>
commit 367b2f609ea502fa0e247e91eeb605c9d26b9c9d
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 10:37:25 2008 +0100
add-defconfig-2.6.25
mostly built-in defconfig for 2.6.25
Signed-off-by: Andy Green <andy at openmoko.com>
commit f324da79e27954289213ee442d664a1fab9ab92b
Author: Mike Wester <mwester at dis.net>
Date: Thu Jun 5 10:37:25 2008 +0100
fix-gta01-pmu-irq-edge-lost-on-resume.patch
GTA01 -only
Restore power button functionality after resume operation
Per Werner's suggestion, run the PMU interrupt handler immediately after resume
to clear/handle any pending interrupts from that device. This appears to
resolve the dead-powerbutton-after-resume problem. This is not well-tested;
need feedback to see if there are any side-effects or other problems.
From BZ 1313
Signed-off-by: Mike Wester <mwester at dis.net>
commit 9487d3fb8567e2c3082b79e916f0fcea3660c1ec
Author: Mike Wester <mwester at dis.net>
Date: Thu Jun 5 10:37:24 2008 +0100
fix-gta01-spi-resume-patch
Patch to register the SPI device and thus the save/resume for the display
This patch does *NOT* resolve this problem, but it does make things a bit
better. The SPI device name changed with 2.6.24, and the change was made for
the gta02 but never propagated to the gta01. With this change, you'll now see
the entries for the spi bus and the display controller in /sys; and the display
controller suspend/resume functions will be called.
(via BZ 79)
Signed-off-by: Mike Wester <mwester at dis.net>
commit d385a8e3220b243734ca2c058db97c256e01faa2
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 10:37:23 2008 +0100
fix-jack-interrupt-debounce-loss-window.patch
Make sure we can't lose a jack interrupt in debounce, despite it is
a one-in-a-million thing that just needs replug to clear
Signed-off-by: Andy Green <andy at openmoko.com>
commit d922b867f23489531998e4794579d82a93baec00
Author: Holger Freyther <zecke at openmoko.org>
Date: Thu Jun 5 10:37:23 2008 +0100
[neo] Every access to GPIO bank B has to go through the shadow code
- Any setting of any PIN on bank B will undo the LED setting.
Introduce neo1973_gpb_set_pin to set the PIN in a way not losing
the LED or any other shadowed setting.
- Update users of GPBXY for gta01 and gta02.
Signed-Off-By: Holger Freyther <zecke at openmoko.org>
commit 5a44dcb97c07d7efba5a598adb611fcd7e94c818
Author: Holger Freyther <zecke at openmoko.org>
Date: Thu Jun 5 10:37:23 2008 +0100
[neo bluetooth] GTA01_GPIO_MODEM_RST != GTA02_GPIO_MODEM_RST
The bluetooth enable and modem reset switched the order in
gta02. Do not poke the bluetooth dongle when we want to reset
the modem.
Signed-Off-By: Holger Freyther <zecke at openmoko.org>
commit 11d404d33ed4b2d956bddfd847d37fc07d8d28ef
Author: Holger Freyther <zecke at openmoko.org>
Date: Thu Jun 5 10:37:23 2008 +0100
[led] Misc fixes in the driver code
to_bundle returned the wrong data. The platform_device is the
parent of the class_device used by the LED device class. Return
the correct class.
num_leds was not set to the correct number of registered LEDs. All
loops using num_leds (e.g. module unloading) were not executed at
all.
On removal of the module disable all LEDs.
Signed-Off-By: Holger Freyther <zecke at openmoko.org>
commit c17af28c7b7141c8f468261d326b3bdf2c664cff
Author: Holger Freyther <zecke at openmoko.org>
Date: Thu Jun 5 10:37:23 2008 +0100
[leds] We would enable PWM for all four timers, disable it for all four as well
Currently we do not use the PWM code to drive the LEDS. We have enabled the PWM
for four timer sources but disable it only for three, fix that up.
Signed-Off-By: Holger Freyther <zecke at openmoko.org>
commit 0bfb92e34545957824017bb93d2966a0b2fe03a0
Author: Holger Freyther <zecke at openmoko.org>
Date: Thu Jun 5 10:37:22 2008 +0100
Remove not needed #ifdef as machine_is_ is always defined.
If we build a kernel without gta01/gta02 the
machine_is_ macro will expand to (0) and the compiler will
optimize the if (0) {} away.
Signed-Off-By: Holger Freyther <zecke at openmoko.org>
commit f51db847e06c82bfcafb552fa0f1aa4f5e2cf17a
Author: Holger Freyther <zecke at openmoko.org>
Date: Thu Jun 5 10:37:22 2008 +0100
OpenMoko => Openmoko
Signed-Off-By: Holger Freyther <zecke at openmoko.org>
commit 47ad3863575f0af67c6050e4cd591a2aec329a09
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 10:37:22 2008 +0100
fix-jack-debounce.patch
Headphone jack detection is bouncy, it can trigger multiple interrupts
on insertion or removal. This patch adds a workqueue that waits out the
interrupt spew in 100ms units, and if it sees no more interrupts for 100ms
only then samples and reports the jack state. I was unable to get a bounce
after 20 or so tries after this.
Signed-off-by: Andy Green <andy at openmoko.com>
commit 5f12460edb900be5e9f4f1c4701b969d0cf423e2
Author: warmcat <andy at warmcat.com>
Date: Thu Jun 5 10:37:22 2008 +0100
debug-glamo-add-lcd-regs-to-dump.patch
Signed-off-by: Andy Green <andy at openmoko.com>
commit 5fb200467625201d478e8c4d1bbca14595cb4aac
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 10:37:22 2008 +0100
fix-glamofb-cmd-mode-locking.patch
Glamo "cmd mode" is modal, but nothing took care about locking.
Also cmd mode was entered recursively in rotate_lcd().
Signed-off-by: Andy Green <andy at openmoko.com>
commit aa7209d8a89ae5fee35191005f1cea6ce97b7e44
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 10:37:22 2008 +0100
fix-glamofb-cmdqueue-timeout.patch
loglevl=9 can cause failure to init glamo-fb
problem seems to be too low timeout when text scrolling can
delay commandqueue going empty
Signed-off-by: Andy Green <andy at openmoko.com>
commit b4c8e3272ee1e81e82ff3d8c8effe71694808a7a
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 10:37:20 2008 +0100
fix-gsm-download-irq-balance-issue.patch
Only enable or disable the interrupt if we see we are in the opposing state.
Also force that damn GSM download signal deasserted on probe at the time we
set the logical state for it to deasserted.
Signed-off-by: Andy Green <andy at openmoko.com>
commit a67e744a873f5e43826c579c3e903e0a68eb30e9
Author: Werner Almesberger <werner at openmoko.org>
Date: Thu Jun 5 10:37:20 2008 +0100
audio-tickless-timeout.patch
When we resume, we can end up in
sound/soc/s3c24xx/s3c24xx-i2s.c:s3c24xx_snd_lrsync
with the timer tick still disabled, and the LR signal never happening.
Thus, we loop forever.
The patch below changes the timeout mechanism to use udelay, which
doesn't need timer ticks.
Note that this code is in a module, so to get the fix, you have to
build the modules, and update them.
The kernel now resumes but does the ugly GSM modem ticking. I'll have
to find a good place to turn that one off ...
- Werner
---------------------------------- cut here -----------------------------------
- sound/soc/s3c24xx/s3c24xx-i2s.c (s3c24xx_snd_lrsync): in resume, we may
call s3c24xx_snd_lrsync with timer ticks disabled, thus jiffies never
change. Use udelay to avoid this problem.
commit e5c749d155eec3064bee1e7f7496fcc32045f1b2
Author: warmcat <andy at warmcat.com>
Date: Thu Jun 5 10:37:20 2008 +0100
defconfig-audio.patch
Add in some audio config needed
Signed-off-by: Andy Green <andy at openmoko.com>
commit a63abe3f4416d10000dd302db80d386176ec5422
Author: Sameo <sameo at openedhand.com>
Date: Thu Jun 5 10:37:20 2008 +0100
fix-wlan-disable.patch
see
http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=1288
commit 0fc35d19760aea4573ef28d53a89b72922494044
Author: Holger Freyther <zecke at openmoko.org>
Date: Thu Jun 5 10:37:20 2008 +0100
Enable GPS only if it was powered on before suspending the device
Similar to the neo1974_pm_gsm.c keep a static struct around. On suspend
we will save the current power state, on resume we will use this
information to enable power of the GPS only when it was powered on before.
This is passing basic tests with screen /dev/ttySAC1 on suspend and resume.
Only do this for the GTA02 as I don't have a gllin setup for the GTA01
I wonder why the suspend and resume code is not using gps_pwron_set and why
for the GTA02 we need to keep the state of the GPIOs, this should be done
by the s3c code.
Signed-Off-by: Holger Frether <zecke at openmoko.org>
commit 62d0600a1fdaa0f20df0cfc547b4354f742e3531
Author: Holger Freyther <zecke at openmoko.org>
Date: Thu Jun 5 10:37:20 2008 +0100
Fix the firing of "Jack"-Interrupts after resume when the modem is powered on.
GTA02_GPIO_nDL_GSM defaults to high/1. On resume do not enable the DL_GSM if
it was not enabled before. This is stopping the storm of interrupts.
Fix the logic in the download file handling. Downloads are disabled (0) when
the GTA02_GPIO_nDL_GSM is high (1). To enable downloading set
GTA02_GPIO_nDL_GSM to low (0, !on). Disable the jack interrupt while download
the is active. When disabling download we will get a couple of jack interrupts
but this is hardly avoidable.
Avoid reading the GPIO value if we do not even have a console set.
Signed-Off-by: Holger Freyther <zecke at openmoko.org>
commit 370b4a96e34c268e4747ac8f27951b981c9a9d5d
Author: Holger Freyther <zecke at openmoko.org>
Date: Thu Jun 5 10:37:20 2008 +0100
Fix spelling. flaoting => floating
Signed-Off-by: Holger Freyther <zecke at openmoko.org>
commit eefdc8e44be90a1dbb270e34fb6b2e5aaad8105d
Author: Holger Freyther <zecke at openmoko.org>
Date: Thu Jun 5 10:37:19 2008 +0100
This is gta02 and not gta01. Do not call the vibrator led.
Signed-Off-by: Holger Freyther <zecke at openmoko.org>
commit fedcf9c41fd0ea44ae16ccfaac297142e62b767e
Author: Holger Freyther <zecke at openmoko.org>
Date: Thu Jun 5 10:37:19 2008 +0100
Add GPIO -> IRQ for the s3c2410 and add irq_to_gpio to the gpio.h of the Samsung SoC
Use this irq_to_gpio in the neo1973 keyboard driver
commit 26113344b303adeee59daf25237ff3ec25db8e0b
Author: Holger Freyther <zecke at openmoko.org>
Date: Thu Jun 5 10:37:19 2008 +0100
Convert the driver to the generic GPIO framework
Signed-Off-by: Holger Freyther <zecke at openmoko.org>
commit c991c2cbf1d4efb16f6b447919fc7aacb9279876
Author: Holger Freyther <zecke at openmoko.org>
Date: Thu Jun 5 10:37:19 2008 +0100
Fix the FIXME, store the GPIO value for now
Signed-Off-by: Holger Freyther <zecke at openmoko.org>
commit 68cf39b11302a4be7c52bcf68f24142211e74250
Author: Holger Freyther <zecke at openmoko.org>
Date: Thu Jun 5 10:37:19 2008 +0100
Remove dead code
Signed-Off-by: Holger Freyther <zecke at openmoko.org>
commit f2a16c18c09a14a1e9550c556c17a67f733b874c
Author: Holger Freyther <zecke at openmoko.org>
Date: Thu Jun 5 10:37:19 2008 +0100
Simplify the code, there is no need for a branch. The code for
GTA01_GPIO_AUX_KEY looks odd.
Signed-Off-by: Holger Freyther <zecke at openmoko.org>
commit ef53a6c19f9280537fe43abd52d9481ed5215feb
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 10:37:19 2008 +0100
add-pcb-rev-sysfs.patch
Signed-off-by: Andy Green <andy at openmoko.com>
commit 214639ae9c808e58a6e530adaf093018d94d8cdb
Author: warmcat <andy at warmcat.com>
Date: Thu Jun 5 10:37:19 2008 +0100
debug-glamo-dump-regs.patch
From: Andy Green <andy at openmoko.com>
Sigend-off-by: Andy Green <andy at openmoko.com>
commit 7d382edceaec1194fea3df757c68d88e73a50fba
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 10:37:18 2008 +0100
add-gta02-pcb-revision-detect.patch
Add function
int gta02_get_pcb_revision(void)
which returns state of GTA02 PCB revision pins. It is also called
and logged during boot with KERN_INFO. The results look like:
b9 b8 b2 b1 b0
GPD4 GPD3 GPD0 GPC15 GPC13
GTA02 A5 and before: 0x000
GTA02 A6 : 0x001
Signed-off-by: Andy Green <andy at openmoko.com>
commit 7fe598ccc50c0cfd145f5ebf26cebced8c94673b
Author: Holger Freyther <zecke at openmoko.org>
Date: Thu Jun 5 10:37:18 2008 +0100
Do not send low level debugging to the modem
Hey,
I see no reason to send LL debugging messages to the modem. This can happen if
we compile the Samsung SoC with PM debugging as in andy's git branch.
From 452c17990dfeb9c2eb2ffa7ded4d24ddb1bcd4b2 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke at openmoko.org>
Date: Sun, 23 Mar 2008 00:57:28 +0100
Subject: [PATCH] Never ever send debug messages to the modem. The serial
console is
on UART2, send the messages for decompressing and low level debugging
there.
Signed-Off-by: Holger Freyther <zecke at openmoko.org>
commit a0508eb754e3d031144225fb66842e3682ded40f
Author: warmcat <andy at warmcat.com>
Date: Thu Jun 5 10:37:18 2008 +0100
fix-suspend-gps-tx-level.patch
We used to drive output high into GPS unit in suspend
Signed-off-by: Andy Green <andy at openmoko.com>
commit e7e3ab7d64c2a1d8b42d21ffbafc770bb21ceec2
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 10:37:18 2008 +0100
fix-lis302dl-suspend-gpio.patch
Add platform stuff to deal with going in and out of suspend
so the motion sensor IO is not driving high into unpowered sensors
Signed-off-by: Andy Green <andy at openmoko.com>
commit 7a9df2f703fcfa363592612570f7dcd5ccb67a92
Author: Holger Hans Peter Freyther <zecke at openmoko.org>
Date: Thu Jun 5 10:37:18 2008 +0100
add-pcf50633-06-RTC_AIE-ioctl
Hey,
the legacy application 'atd' from Russ Nelson/Nils Faerber, used by Qtopia, to
schedule alarms currently fails to start as the the above ioctl is failing.
The other drivers in drivers/rtc implement the above ioctl and we can
implement it too.
The code to mask/unmask the RTC alarm is copied from the set_alarm routine and
adapted to use the reg_set_bit_mask and reg_set_clear_mask.
It is compiling, so it must work. Please welcome me the lkml way ;)
Signed-Off-by: Holger Hans Peter Freyther <zecke at openmoko.org>
commit b3d5a863e01d801a73c895d9d50194928855a0a1
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 10:37:18 2008 +0100
fix-charging-deassert-host-power-1a-detect.patch
We don't take care to stop driving generated USB host power even
when we have a 1A charger connected on the same pins.
Signed-off-by: Andy Green <andy at openmoko.com>
commit 9d108a572b190221fd1693a0310010c307d5ed80
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 10:37:18 2008 +0100
introduce-usb-host-power-control.patch
Unless I really really missed the point, there is no support for enabling
USB Host power for USB host mode. This patch adds a /sys node for GTA02
that allows control of the charge pump for 5V out on the USB mini connector
It doesn't change any logical mode in the CPU, just enables (1) and disables
(0) USB host power.
# cat /sys/devices/platform/neo1973-pm-host.0/hostmode
0
# echo 1 > /sys/devices/platform/neo1973-pm-host.0/hostmode
Signed-off-by: Andy Green <andy at openmoko.com>
commit 2675bba8fd30c7e4cb6aad0019d79ae640998d3f
Author: warmcat <andy at warmcat.com>
Date: Thu Jun 5 10:37:17 2008 +0100
fix-gpio-led-patch-still-pwm-t3.patch
Starting up all the PWMs seems to be needed for PWM3 operation
and FIQ / HDQ / VIB operation. But after starting, turn the
LEDs to GPIO-only.
Applies on top of Willie's patch
Signed-off-by: Andy Green <andy at openmoko.com>
commit 2ed89d301adaeb589ee4b57f12b1c046f73fad1b
Author: Willie <willie_chen at openmoko.com>
Date: Thu Jun 5 10:37:17 2008 +0100
use gpio control leds
commit 73eadc2dbc79eb43515a6e2dad0636aea4f3fa0a
Author: warmcat <andy at warmcat.com>
Date: Thu Jun 5 10:37:17 2008 +0100
fix-glamo-mci-fake-reset-opcode-in-suspend.patch
commit 3c9ab165a09fa52dcac1884752e3481e32c18173
Author: warmcat <andy at warmcat.com>
Date: Thu Jun 5 10:37:17 2008 +0100
fix-lcm-reinit-post-resume.patch
commit 70b4abef8114ac677936cb9e498e04481d8163d4
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 10:37:17 2008 +0100
fix-glamo-mci-defeat-ops-during-suspend.patch
We need to be able to use the config option CONFIG_MMC_UNSAFE_RESUME that allows the rootfs
to live on SD. But when we use this, it tries to send a reset command to the SD card during
suspend -- and unfortunately many things like Power have suspended by then.
This patch again rejects IO on the MMC device during suspend of the MMC device, and it
gives the result the rootfs on SD card works okay.
Signed-off-by: Andy Green <andy at openmoko.com>
commit 33ad9d028c40ffd436c9ea3fd97e978e74bbffa1
Author: warmcat <andy at warmcat.com>
Date: Thu Jun 5 10:37:17 2008 +0100
config-add-alsa.patch
commit 355c095835386f57d72c1ec7be3e832f8f64d9ca
Author: warmcat <andy at warmcat.com>
Date: Thu Jun 5 10:37:16 2008 +0100
fix-s3c2410_timer_setup-resume-BUG.patch
commit 0c607c777788455323a4df0ff6d3a9910482db20
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 10:37:16 2008 +0100
debug-suspend-dump-gpio-states-add-GPA.patch
Add support for GPA[] GPIO bus since we have some NCs
but they seem to output-only IO cells so no matter
Signed-off-by: Andy Green <andy at openmoko.com>
commit 009a5d26090c4997401247e3c664ac905c1176c1
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 10:37:16 2008 +0100
introduce-bq27000-battery-driver.patch
This is a driver for the bq27000 found in the Highcell A5
battery, and the platform device stuff for it for GTA02. It
is a Power Supply Class battery device.
The driver doesn't contain an HDQ engine but accepts pointers
from the platform data to the HDQ action routines; our
platform data plugs it into the FIQ HDQ engine stuff.
The Power Supply class exposes the battery down /sys so you
can find out battery status by doing the equivalent of this
bash command
for i in capacity charge_full current_now present status technology temp time_to_empty_now time_to_full_now type voltage_now ; do echo -n "$i " ; cat /sys/devices/platform/bq27000-battery.0/power_supply/bat/$i ; done
Here is the kind of result you get from a battery discharging
capacity 0
charge_full 1215585
current_now 183375
present 1
status Discharging
technology Li-ion
temp 276
time_to_empty_now 0
time_to_full_now 3932100
type Battery
voltage_now 2761000
Note that temp is in 1/10 degrees C, other values are in uV,
uA, uW. The time_to_* reported are bogus, but that is what
the battery actually reports.
We can make more mappings to entries in power_supply class
but this is enough to get started with.
Signed-off-by: Andy Green <andy at openmoko.com>
commit dc782377acf77f91afa886190742fdafb583d88e
Author: Andy Green <andy at openmoko.com>
Date: Thu Jun 5 10:37:15 2008 +0100
introduce-fiq-hdq.patch
This adds a platform driver and device which performs HDQ
battery protocol using a single GPIO pin which is set
through platform data.
HDQ has some hard latency requirements which can't
be met if interrupts are enabled, so normally using
a GPIO for this will require blocking out all other
interrupts and processes for several milliseconds
per register being read or written.
This HDQ protocol engine is a FSM implemented inside the
the FIQ ISR and regulated by timer interrupts happening
at 20us intervals. The path through the FSM on any
"clock" is very short and should be over with in ~
1us. Because FIQ has guaranteed latencies of <1us,
it means we can service the HDQ protocol without
blocking interrupts or any other process other than
the caller that is waiting for the result. It's pretty
cool performance from 1 GPIO ;-)
Due to it being hard to do locking from the FIQ ISR
the code simply sleeps 10ms or whatever the scheduler
gives it and checks if the transfer took place yet.
This platform driver doesn't have any knowledge about
the device it is talking to, it just knows it is a
HDQ device. It exports three functions for read, write
and confirming HDQ is initialized. It also exports two
/sys nodes that are usable by humans, one dumps the whole
127 register HDQ register space
# cat /sys/devices/platform/gta02-hdq.0/hdq/dump
00 44 55 00 00 00 ba 04 a2 0d 50 00 00 00 00 00
00 00 9a 1a 00 00 ff ff ff ff 29 00 00 00 80 2b
00 00 00 00 00 00 ff ff 00 00 00 00 00 32 af 06
a0 d8 37 4e 00 00 00 00 00 00 00 34 2e 03 b4 e7
00 00 06 00 41 00 4c 02 00 00 00 00 00 00 00 00
83 02 00 00 94 09 59 b9 a5 0d 7f 21 00 00 7a ff
df ff 62 ff a7 04 2e 05 00 00 00 01 00 07 00 00
2a 78 36 67 7b b5 1b a9 af 19 38 89 63 57 42 7c
#
and the other allows to set one register
# echo 2 170 > /sys/devices/platform/gta02-hdq.0/hdq/write
writes 0xAA into register 2.
Signed-off-by: Andy Green <andy at openmoko.com>
commit d01abf7fd4ffeae547f47c3ef235edcf3a5dd9ce
Author: warmcat <andy at openmoko.com>
Date: Thu Jun 5 10:37:15 2008 +0100
clean-snip-gpio-reinit.patch
These are initialized already
Signed-off-by: Andy Green <andy at openmoko.com>
commit eba0fe336c3323e994fed69c65eeb7e3d425737a
Author: warmcat <andy at openmoko.com>
Date: Thu Jun 5 10:37:15 2008 +0100
bugfix-deglitch-gpio-output-enable.patch
commit dde8557be26c9feaa0f9c67cfd62a142447fe563
Author: Mike Montour <mail at mmontour.net>
Date: Thu Jun 5 10:37:15 2008 +0100
contrib-fix-chgstate-array-bloat.patch
--- linux-2.6.22/drivers/i2c/chips/pcf50606.c.orig 2008-01-17 22:30:16.000000000 -0800
+++ linux-2.6.22/drivers/i2c/chips/pcf50606.c 2008-01-17 22:31:43.000000000 -0800
@@ -71,12 +71,19 @@
I2C_CLIENT_INSMOD_1(pcf50606);
-#define PCF50606_F_CHG_FAST 0x00000001 /* Charger Fast allowed */
-#define PCF50606_F_CHG_PRESENT 0x00000002 /* Charger present */
-#define PCF50606_F_CHG_FOK 0x00000004 /* Fast OK for battery */
-#define PCF50606_F_CHG_ERR 0x00000008 /* Charger Error */
-#define PCF50606_F_CHG_PROT 0x00000010 /* Charger Protection */
-#define PCF50606_F_CHG_READY 0x00000020 /* Charging completed */
+#define PCF50606_B_CHG_FAST 0 /* Charger Fast allowed */
+#define PCF50606_B_CHG_PRESENT 1 /* Charger present */
+#define PCF50606_B_CHG_FOK 2 /* Fast OK for battery */
+#define PCF50606_B_CHG_ERR 3 /* Charger Error */
+#define PCF50606_B_CHG_PROT 4 /* Charger Protection */
+#define PCF50606_B_CHG_READY 5 /* Charging completed */
+
+#define PCF50606_F_CHG_FAST (1<<PCF50606_B_CHG_FAST) /* Charger Fast allowed */
+#define PCF50606_F_CHG_PRESENT (1<<PCF50606_B_CHG_PRESENT) /* Charger present */
+#define PCF50606_F_CHG_FOK (1<<PCF50606_B_CHG_FOK) /* Fast OK for battery */
+#define PCF50606_F_CHG_ERR (1<<PCF50606_B_CHG_ERR) /* Charger Error */
+#define PCF50606_F_CHG_PROT (1<<PCF50606_B_CHG_PROT) /* Charger Protection */
+#define PCF50606_F_CHG_READY (1<<PCF50606_B_CHG_READY) /* Charging completed */
#define PCF50606_F_CHG_MASK 0x000000fc
#define PCF50606_F_PWR_PRESSED 0x00000100
@@ -1026,12 +1033,12 @@
static DEVICE_ATTR(chgmode, S_IRUGO | S_IWUSR, show_chgmode, set_chgmode);
static const char *chgstate_names[] = {
- [PCF50606_F_CHG_FAST] = "fast_enabled",
- [PCF50606_F_CHG_PRESENT] = "present",
- [PCF50606_F_CHG_FOK] = "fast_ok",
- [PCF50606_F_CHG_ERR] = "error",
- [PCF50606_F_CHG_PROT] = "protection",
- [PCF50606_F_CHG_READY] = "ready",
+ [PCF50606_B_CHG_FAST] = "fast_enabled",
+ [PCF50606_B_CHG_PRESENT] = "present",
+ [PCF50606_B_CHG_FOK] = "fast_ok",
+ [PCF50606_B_CHG_ERR] = "error",
+ [PCF50606_B_CHG_PROT] = "protection",
+ [PCF50606_B_CHG_READY] = "ready",
};
static ssize_t show_chgstate(struct device *dev, struct device_attribute *attr,
commit 4fcea27c10eedb98a2fb6b2e71e449c93db9257a
Author: warmcat <andy at warmcat.com>
Date: Thu Jun 5 10:37:15 2008 +0100
local-config-ext2.patch
commit 77fc1a7950237ea913f68e83d4878c57c51abfbc
Author: warmcat <andy at warmcat.com>
Date: Thu Jun 5 10:37:15 2008 +0100
local-config-pmu.patch
commit 60ee2a797ad95d24bf40dee0bef977d346f9fab4
Author: warmcat <andy at openmoko.com>
Date: Thu Jun 5 10:37:14 2008 +0100
local-config-defconfig-motion-sensor-gpio.patch
commit 169704b131f69d3c1b6e2b74078676b8eae8c970
Author: warmcat <andy at warmcat.com>
Date: Thu Jun 5 10:37:14 2008 +0100
local-config-wlan-config-changes.patch
commit 004bbf9fa03df386781779c50d5db34d273591e3
Author: warmcat <andy at openmoko.com>
Date: Thu Jun 5 10:37:14 2008 +0100
local-config-add-bluetooth-monolithic.patch
Add Bluetooth in monolithic kernel
commit 2ab7b72af7ac0d78e0a0278463e237626e8b41c1
Author: warmcat <andy at warmcat.com>
Date: Thu Jun 5 10:37:14 2008 +0100
local-config-add-vfat-nls-to-kern.patch
SD Card / VFAT in monolithic kernel
Signed-off-by: Andy Green <andy at openmoko.com>
commit 76c020f25f788e851077b33e918d4ed3ae8bf489
Author: warmcat <andy at warmcat.com>
Date: Thu Jun 5 10:37:14 2008 +0100
local-update-defconfig-for-2.6-dev.patch
Make a defconfig for 2.6.24 out of the current 2.6.22.5 one
From: warmcat <andy at warmcat.com>
commit fa9d3dc8a3ff9330848a57f5b7bc10fd0cabc31d
Author: warmcat <andy at warmcat.com>
Date: Thu Jun 5 10:37:14 2008 +0100
local-build-new-dfu-vid.patch
Update to new DFU VID for A5
Signed-off-by: Andy Green <andy at openmoko.com>
commit 62182ac0ba20f45a79098530ee4e8e05d79a407a
Author: warmcat <andy at warmcat.com>
Date: Thu Jun 5 10:37:14 2008 +0100
local-build-scripts.patch
Add a couple of handy scripts to crossmake and send over dfu
From: warmcat <andy at warmcat.com>
commit 2e8f5378403d38e56451d807a9c0088f225ea7d0
Author: warmcat <andy at warmcat.com>
Date: Thu Jun 5 10:37:14 2008 +0100
local-add-defconfig.patch
Adds svn defconfig
From: warmcat <andy at warmcat.com>
commit f245a98f6de14c5ad016faea5d89060e67e4fc8b
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:44 2008 +0100
glamo-cmdqueue-bandaid.patch
[ Stop kernel from hanging every once in a while during Glamo
initialization. ]
debug-glamo-fb-cmdqueue-wait-timeout.patch
From: warmcat <andy at warmcat.com>
commit e95c93f717d7e792d3e999b65c980b498e52f6b4
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:43 2008 +0100
gta02-sound-bandaid.patch
http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=1172
This patch seems to alleviate the symptoms but doesn't cure them.
Keep it to keep development going, until we have a proper solution.
commit 1024d45d3a128878970c7ecab03f59a041f60693
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:42 2008 +0100
suspend-prelim1.patch
commit 5f1d4cac64160d04ba0deb5880703156280fbe5a
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:42 2008 +0100
gta01-dehang-printk.patch
This is a temporary work-around Mike Westerhof for this bug:
http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=788
See also
http://lists.openmoko.org/pipermail/openmoko-kernel/2008-February/000804.html
(It's the 2nd option.)
We may settle on a different solution in the future, depending on
feedback from upstream.
commit 5d3bfc75fe83d64c357bf9f119ade53b0cbb65af
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:42 2008 +0100
fix-pcf50633-LOWBAT-kill-init.patch
commit eb40aad5224333158c22226102dd08f8c63bdcb7
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:42 2008 +0100
fix-pcf50606-LOWBAT-kill-init.patch
commit 757bb6d4ffaef4710314595474a88d91814598ac
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:42 2008 +0100
fix-hwecc-2410.patch
S3C24xx ECC mis-calculates the bit to flip:
http://lists.infradead.org/pipermail/linux-mtd/2007-October/019586.html
If the error couldn't be corrected, we returned "no problem" :-(
http://lists.infradead.org/pipermail/linux-mtd/2007-October/019615.html
Signed-off-by: Werner Almesberger <werner at openmoko.org>
commit 554759548898b7ef6e14ef1d463287451a62f1a6
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:42 2008 +0100
atheros_2_0_sdio_stack.patch
commit da50a6920b0a4ed72aed078d9945429c3efff62a
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:42 2008 +0100
atheros_2_0_hcd.patch
commit 18271554f9b54eac616985afbacdcb020c6856e9
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:41 2008 +0100
atheros_2_0_function.patch
commit 5acef164071d2bbe7a11f2b1bb6f5c3157590002
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:41 2008 +0100
pnp_fixes.patch
commit 409174f06c3eb0d07ea5190d446b03955b86d2a5
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:41 2008 +0100
s3c2410-usb-switch.patch
commit 02bef060f133b4e94796f32b5e2aabb8b50bcb89
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:41 2008 +0100
fix-EVIOCGRAB-semantics.patch
commit 391da85b0f020b41f95459ad1e2a88c070bf5185
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:41 2008 +0100
bq27000-battery-driver.patch
commit 25f3f90b233ef7b309fa7979c52aea3d5d8a5fe9
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:41 2008 +0100
fiq-hdq.patch
commit 4aed962e0a98b2f3cdc360f613549b2dee07b1b1
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:41 2008 +0100
introduce-fiq-migrate-vibrator-gta02-only.patch
On GTA02 we use FIQ to manage the vibrator IO now. That
is necessary because we stole timer3 from doing hw pwm
for vibrator. This keeps the same UI in /sys but does
"bitbang pwm" on the same vibrator GPIO
From: Andy Green <andy at openmoko.com>
Signed-off-by: Andy Green <andy at openmoko.com>
commit bbe9b74d8408b0e09e36fd1498387602a72fc2c1
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:41 2008 +0100
introduce-fiq-use-timer3-as-source.patch
This makes the FIQ stuff specific to one of the timers on the
s3c244x and adds the platform stuff for fiq in the gta02 init
Currently one sysfs node is exposed, a count of FIQ events
cat /sys/devices/platform/sc32440_fiq.0/fiq/count
From: Andy Green <andy at openmoko.com>
Signed-off-by: Andy Green <andy at openmoko.com>
commit 40e14dcb6d357c099fa658cc13cb3dc38eedd0bb
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:40 2008 +0100
introduce-fiq-basis.patch
Adds a C-based FIQ ISR which is very convenient (and unusual --
normally you have to do FIQ ISR in assembler only).
Based on my article:
http://warmcat.com/_wp/2007/09/17/at91rm9200-fiq-faq-and-simple-example-code-patch/
Implemented as a platform device and driver.
Suspend / resume is tested and works.
Signed-off-by: Andy Green <andy at warmcat.com>
commit 156bed35c97edd3dd92d2714efd5ec46febed9f3
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:40 2008 +0100
fail-unless-uimage.patch
Fail the build noisily if "mkimage" can't be found, e.g., if we forgot to add
the u-boot directory to PATH.
commit 20affa1dd26d42a9a6fa3396a4a388ec56f47293
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:40 2008 +0100
s3c2410-qt2410-buttons.patch
commit 42daff009f6805384de8708bed3bfb0234f537ea
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:40 2008 +0100
qt2410-cs8900.patch
commit a84c873b6ab1879dac47e2f25277c974d1016620
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:40 2008 +0100
s3c2440-nand-disable-hwecc.patch
Disable the hardware ECC checking on S3C2440 based platforms (HXD8, SMDK2440,
GTA02) for the time being, since our u-boot doesn't yet support it for 2k page
size NAND
commit 4e3066f41c8c34475e9d999be762931424ded735
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:40 2008 +0100
input-nots-mousedev.patch
This patch disables the reporting of touchscreen-like devices via
/dev/input/mice. In the Neo1973 (much like other handheld devices),
we need this to distinguish between the touchscreen (which uses tslib)
and optional additional usb/bluetooth mice that might be attached.
Signed-off-by: Harald Welte <laforge at openmoko.org>
commit 1646be4673a4a3a0c2b38d01f69f9b7c0a2927f9
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:40 2008 +0100
s3c2410_serial-nodebug.patch
commit 8945f13ec649703315b1a2e504e0b8b3001f4e28
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:40 2008 +0100
pm-debug_less_verbose.patch
commit 683b479223c8116f573e87df6c63a4710aa9edac
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:40 2008 +0100
config-nr-tty-devices.patch
commit f7b97dbfed4f8d6eeaeee402aa36442069dc890a
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:39 2008 +0100
openmoko-logo.patch
commit f3d6392ac6b8b32ee7a9253c6d805d4488a0b8e5
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:39 2008 +0100
gta02-bt-fixes.patch
Modify GTA02 power manager for bluetooth.
1. Default power value isn't correct. Now we set pcf50633 LDO4 to 3.2 voltage.
2. Separate GTA01 and GTA02 source code.
3. Add pcf50633 API for enable register.
commit 0d0a0797a2caa4af21869fffab04bfe223dcd736
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:39 2008 +0100
pcf506xx.patch
Moved shared PMU code from pcf50606.h and pcf50633.h (which prevented inclusion
of both at the same time) to pcf506xx.h
- include/linux/pcf50606.h (struct pmu_voltage_rail, enum pmu_event, pmu_cb):
moved to pcf506xx.h
- include/linux/pcf50633.h (struct pmu_voltage_rail, enum pmu_event, pmu_cb):
moved to pcf506xx.h
Signed off-by: Werner Almesberger <werner at openmoko.org>
commit 15685169d944cc3ffe5f6d565a7b3cd187c2747a
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:39 2008 +0100
gta02-acc.patch
commit 63f727d09a81a574ffe7c656b85e8a2c452b9396
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:39 2008 +0100
gta02-leds.patch
commit 2c269c49595a0e9a7355c7528ec94aaa728a1f37
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:39 2008 +0100
lis302dl.patch
This is a Linux driver for the STmicro LIS302DL 3-axis accelerometer.
Signed-off-by: Harald Welte <laforge at openmoko.org>
commit fa45a9f719c78be17bc08dd3767538e9ae2c1760
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:39 2008 +0100
gta02-sound.patch
commit fdf726e7bb8a324cf12635a203c8c9b30226b6bf
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:39 2008 +0100
gta02-power_control.patch
commit 8db6a4f75673aa958a16b377f476059ac3f8f6f3
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:38 2008 +0100
gta02-core.patch
commit 9c012ba456068d3b246286eae63a8afe75fbf5d8
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:38 2008 +0100
glamo-mmc.patch
commit 1c5af0005ca880af63d4ff34f5132d3dde0f797c
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:38 2008 +0100
smedia-glamo.patch
[ FIXME:
include/asm-arm/arch-s3c2410/irqs.h shouldn't contain device-specific
changes. ]
This is a Linux kernel driver for the Smedia Glamo336x / Glamo337x
multi-function peripheral device.
Signed-off-by: Harald Welte <laforge at openmoko.org>
commit c6f74144f11444c4399afba6e7f27b537210f5b0
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:37 2008 +0100
pcf50633-suspend-hacks.patch
commit 43dc1011ceec883eae1175bb44df15787e8fefa1
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:37 2008 +0100
pcf50633.patch
commit 562bba00ffc5519e2882db0a026bc461cac15f5d
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:37 2008 +0100
s3c2442b-cpuid.patch
Add the Samsung S3C2442B CPU idcode to the samsung s3c24xx platform code
and fix a Kconfig typo related tot the 2442.
commit b345f2b04cb444576a5329ef09b393766d401ebb
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:37 2008 +0100
s3c2410_udc-2440_dual_packet-workaround.patch
This is a patch that seems to make the USB hangs on the S3C2440 go away. At
least a good amount of ping torture didn't make them come back so far.
The issue is that, if there are several back-to-back packets,
sometimes no interrupt is generated for one of them. This
seems to be caused by the mysterious dual packet mode, which
the USB hardware enters automatically if the endpoint size is
half that of the FIFO. (On the 2440, this is the normal
situation for bulk data endpoints.)
There is also a timing factor in this. I think what happens is
that the USB hardware automatically sends an acknowledgement
if there is only one packet in the FIFO (the FIFO has space
for two). If another packet arrives before the host has
retrieved and acknowledged the previous one, no interrupt is
generated for that second one.
However, there may be an indication. There is one undocumented
bit (none of the 244x manuals document it), OUT_CRS1_REG[1],
that seems to be set suspiciously often when this condition
occurs. There is also CLR_DATA_TOGGLE, OUT_CRS1_REG[7], which
may have a function related to this. (The Samsung manual is
rather terse on that, as usual.)
This needs to be examined further. For now, the patch seems to do the
trick.
Note that this is not a clean solution by any means, because we
might potentially get stuck in that interrupt for quite a while.
commit f68bdcfb727c4e385681c506f2ae375715032ce7
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:37 2008 +0100
s3c24xx-nand-largepage.patch
MTD: S3C24XX large page NAND support
This adds support for using large page NAND devices
with the S3C24XX NAND controller. This also adds the
file Documentation/arm/Samsung-S3C24XX/NAND.txt to
describe the differences.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
commit 3e72c7726398248f8d80b9af140ba67e1eca1cd6
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:37 2008 +0100
s3c_mci-gta01.patch
commit 832e6a664f85fd2212407c06bc38e46282e8699c
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:37 2008 +0100
s3c_mci.patch
This is a MMC/SD driver for the Samsung S3C24xx SD/MMC controller, originally
developed years ago by Thomas Kleffel <tk at maintech.de>.
Due to time restraints, he had no time to further maintain the driver and
follow the mainline Linux changes in the SD/MMC stack.
With his authorization, I have taken over the task of making it compliant to
the current mainline SD/MMC API and take care of the mainline kernel merge.
After a potential kernel inclusion, we would co-maintain the driver.
Acked-by: Thomas Kleffel <tk at maintech.de>
Signed-off-by: Harald Welte <laforge at gnumonks.org>
commit f31e566dc23e9796c4ee430da3732a462feb03eb
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:37 2008 +0100
g_ether-vendor_product.patch
Use FIC's own USB Vendor ID rather than NetChip's
Yes, we could solve this by some modprobe.conf parameters, but I'd like to
rather not rely on this.
commit ddf4d69f1ec5b130a9ad45a5f028f833698f0b10
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:36 2008 +0100
g_ether-highpower.patch
commit 96fba2922d5d8391a8f0aa989f888ad5cc708458
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:36 2008 +0100
i2c-permit_invalid_addrs.patch
We need this stupid workaround since our amplifier chip uses a 'reserved' I2C
address
Signed-off-by: Harald Welte <laforge at openmoko.org>
commit c424b3f471494f332f99db67f04e10bd051f0f2b
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:36 2008 +0100
s3c2410_ts-gta01.patch
commit 267e34d069254b1396b5dc6704141265310d80af
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:36 2008 +0100
s3c2410_touchscreen.patch
commit 5368dc57e78734bc9d327ff3ebe7346f4987f8a1
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:35 2008 +0100
gta01-backlight.patch
This is a backlight driver for the FIC/OpenMoko Neo1973 GTA01 GSM Phone
Signed-off-by: Harald Welte <laforge at openmoko.org>
commit 17b57ff4642e5aca6355c634e05a002c4fc30ab7
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:34 2008 +0100
gta01-vibrator.patch
This patch adds driver support for the vibator device of the FIC/OpenMoko
Neo1973 GSM phone. The driver uses the existing LED class driver framework,
since there's a lot of similarity between the LED and the vibrator function.
Signed-off-by: Harald Welte <laforge at openmoko.org>
commit 0c4245e8cbc8b810246f5d48cda568b2ffb4ba50
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:34 2008 +0100
s3c2410-pwm.patch
This patch adds a PWM api abstraction for the S3C2410 SoC
Signed-off-by: Javi Roman <javiroman at kernel-labs.org>
Signed-off-by: Harald Welte <laforge at openmoko.org>
commit fd03f185b5d9407c73a810df61ec651419ed58a3
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:34 2008 +0100
gta01-power_control.patch
[PATCH] Neo1973 GPS / GSM / Bluetooth power control via sysfs
Signed-off-by: Harald Welte <laforge at openmoko.org>
commit cfb949a76afa1c34c05544b550e64c8469874c5c
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:33 2008 +0100
gta01-inputdevice.patch
This provides support for the GTA01 keyboard
Signed-off-by: Harald Welte <laforge at openmoko.org>
commit fb57a5cdc06e4cdf115e1cc55dedbe2bb7ef97a2
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:32 2008 +0100
gta01-jbt6k74.patch
This driver adds support for the SPI-based control interface of the LCM (LCD
Panel) found on the FIC GTA01 hardware.
The specific panel in this hardware is a TPO TD028TTEC1, but the driver should
be able to drive any other diplay based on the JBT6K74-AS controller ASIC.
Signed-off-by: Harald Welte <laforge at openmoko.org>
commit 6ccf015cfa139e5e695348393493d284235d88cf
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:32 2008 +0100
gta01-core.patch
This patch adds support for the FIC Neo1973 GTA01 machine type to the ARM port
of the Linux kernel.
Signed-off-by: Harald Welte <laforge at openmoko.org>
commit ac361f43594cf1d16245a8daa10beb76d76ed5df
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:32 2008 +0100
gta01-pcf50606.patch
This is a NXP PCF50606 power management unit driver.
The PCF50606 is used in the FIC/OpenMoko Neo1973 GTA01 GSM phone.
Signed-off-by: Harald Welte <laforge at openmoko.org>
commit 61d6d208631e63127502178413b1baab2261263a
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:32 2008 +0100
s3c2410-bbt.patch
[PATCH] Add Kconfig option to enable NAND bad-block-table support for s3c2410
This patch adds a new CONFIG_MTD_NAND_S3C2410_BBT which, if enabled,
asks the mtd NAND core to use a bad-block table.
Signed-off-by: Harald Welte <laforge at openmoko.org>
commit 39b7c53d0c691ec0bee80157f8d4686c40e9402b
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:32 2008 +0100
resume-timers-wq.patch
The initialization of clocks uses mutexes, but we execute the resume in
an interrupt context. We therefore have to hand this task to a non-interrupt.
Adapted from a patch by Andy Green.
commit 59bb316ae49d08aa8b3e6c642b6bc9652986a362
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:32 2008 +0100
fix-i2c-s3c2410-resume-race.patch
fix-i2c-s3c2410-resume-race.patch
There is a nasty race between i2c-s3c2410 resume and resume of I2C
driver and the client drivers -- the watchdog device actually gets to
use the dead I2C bus before it is reinitialized by the I2C driver
resume! This patch makes sure any customers get turned away until
the shopkeeper has woken up.
Signed-off-by: Andy Green <andy at openmoko.com>
commit 0f1ca5ede4fda9103f56ed646052053574a3babf
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:32 2008 +0100
gta01-no_nand_partitions.patch
[PATCH] support mtd NAND commandline partitions for S3C2410
This patch adds support for the mtd NAND core standard method of passing
partition table information from the bootloader into the kernel by using
the kernel commandline.
The board specific code can still manually override and provide a fixed
partition table, so this patch will behave backwards compatible.
Signed-off-by: Harald Welte <laforge at openmoko.org>
Acked-byt: Ben Dooks <ben-linux at fluff.org>
commit 3f21a11e5a80ee8a28301171d78e7764452f21fd
Author: mokopatches <mokopatches at openmoko.org>
Date: Thu Jun 5 10:36:32 2008 +0100
explicitly-link-notes-section.patch
Since 2.6.23 kbuild produces a 3GB arch/arm/boot/Image because it includes a
.note.gnu.build-id section at address 0 which is followed by 3GB of 0x00.
The --build-id option is set in the toplevel Makefile.
This patch explicitly puts the notes section after the TEXT section.
commit 53c8ba95402be65d412a806cda3430f0e72cd107
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Jun 4 20:10:44 2008 -0700
Linux 2.6.26-rc5
commit 3e387fcdc485d94fe2c4b52e7c30c0c4cd1fe364
Merge: 9489a0625854cd7482bb0e8b37de4406cdcd49e0 24b95685ffcdb3dc28f64b9e8af6ea3e8360fbc5
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Jun 4 17:39:33 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (56 commits)
l2tp: Fix possible oops if transmitting or receiving when tunnel goes down
tcp: Fix for race due to temporary drop of the socket lock in skb_splice_bits.
tcp: Increment OUTRSTS in tcp_send_active_reset()
raw: Raw socket leak.
lt2p: Fix possible WARN_ON from socket code when UDP socket is closed
USB ID for Philips CPWUA054/00 Wireless USB Adapter 11g
ssb: Fix context assertion in ssb_pcicore_dev_irqvecs_enable
libertas: fix command size for CMD_802_11_SUBSCRIBE_EVENT
ipw2200: expire and use oldest BSS on adhoc create
airo warning fix
b43legacy: Fix controller restart crash
sctp: Fix ECN markings for IPv6
sctp: Flush the queue only once during fast retransmit.
sctp: Start T3-RTX timer when fast retransmitting lowest TSN
sctp: Correctly implement Fast Recovery cwnd manipulations.
sctp: Move sctp_v4_dst_saddr out of loop
sctp: retran_path update bug fix
tcp: fix skb vs fack_count out-of-sync condition
sunhme: Cleanup use of deprecated calls to save_and_cli and restore_flags.
xfrm: xfrm_algo: correct usage of RIPEMD-160
...
commit 9489a0625854cd7482bb0e8b37de4406cdcd49e0
Merge: edeb280e49d38a5330db25463ef45f5466b0058a 399dc43bc29fe1ac19340c56c0df84aa0ea53c85
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Jun 4 17:38:44 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc: switch /proc/led to seq_file
sparc64: IO accessors fix
commit 24b95685ffcdb3dc28f64b9e8af6ea3e8360fbc5
Author: James Chapman <jchapman at katalix.com>
Date: Wed Jun 4 15:54:07 2008 -0700
l2tp: Fix possible oops if transmitting or receiving when tunnel goes down
Some problems have been experienced in the field which cause an oops
in the pppol2tp driver if L2TP tunnels fail while passing data.
The pppol2tp driver uses private data that is referenced via the
sk->sk_user_data of its UDP and PPPoL2TP sockets. This patch makes
sure that the driver uses sock_hold() when it holds a reference to the
sk pointer. This affects its sendmsg(), recvmsg(), getname(),
[gs]etsockopt() and ioctl() handlers.
Tested by ISP where problem was seen. System has been up 10 days with
no oops since running this patch. Without the patch, an oops would
occur every 1-2 days.
Signed-off-by: James Chapman <jchapman at katalix.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 293ad60401da621b8b329abbe8c388edb25f658a
Author: Octavian Purdila <opurdila at ixiacom.com>
Date: Wed Jun 4 15:45:58 2008 -0700
tcp: Fix for race due to temporary drop of the socket lock in skb_splice_bits.
skb_splice_bits temporary drops the socket lock while iterating over
the socket queue in order to break a reverse locking condition which
happens with sendfile. This, however, opens a window of opportunity
for tcp_collapse() to aggregate skbs and thus potentially free the
current skb used in skb_splice_bits and tcp_read_sock.
This patch fixes the problem by (re-)getting the same "logical skb"
after the lock has been temporary dropped.
Based on idea and initial patch from Evgeniy Polyakov.
Signed-off-by: Octavian Purdila <opurdila at ixiacom.com>
Acked-by: Evgeniy Polyakov <johnpol at 2ka.mipt.ru>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 26af65cbeb2467a486ae4fc7242c94e470c67c50
Author: Sridhar Samudrala <sri at us.ibm.com>
Date: Wed Jun 4 15:19:35 2008 -0700
tcp: Increment OUTRSTS in tcp_send_active_reset()
TCP "resets sent" counter is not incremented when a TCP Reset is
sent via tcp_send_active_reset().
Signed-off-by: Sridhar Samudrala <sri at us.ibm.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 22dd485022f3d0b162ceb5e67d85de7c3806aa20
Author: Denis V. Lunev <den at openvz.org>
Date: Wed Jun 4 15:16:12 2008 -0700
raw: Raw socket leak.
The program below just leaks the raw kernel socket
int main() {
int fd = socket(PF_INET, SOCK_RAW, IPPROTO_UDP);
struct sockaddr_in addr;
memset(&addr, 0, sizeof(addr));
inet_aton("127.0.0.1", &addr.sin_addr);
addr.sin_family = AF_INET;
addr.sin_port = htons(2048);
sendto(fd, "a", 1, MSG_MORE, &addr, sizeof(addr));
return 0;
}
Corked packet is allocated via sock_wmalloc which holds the owner socket,
so one should uncork it and flush all pending data on close. Do this in the
same way as in UDP.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Acked-by: Alexey Kuznetsov <kuznet at ms2.inr.ac.ru>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 199f7d24ae59894243687a234a909f44a8724506
Author: James Chapman <jchapman at katalix.com>
Date: Wed Jun 4 15:07:32 2008 -0700
lt2p: Fix possible WARN_ON from socket code when UDP socket is closed
If an L2TP daemon closes a tunnel socket while packets are queued in
the tunnel's reorder queue, a kernel warning is logged because the
socket is closed while skbs are still referencing it. The fix is to
purge the queue in the socket's release handler.
WARNING: at include/net/sock.h:351 udp_lib_unhash+0x41/0x68()
Pid: 12998, comm: openl2tpd Not tainted 2.6.25 #8
[<c0423c58>] warn_on_slowpath+0x41/0x51
[<c05d33a7>] udp_lib_unhash+0x41/0x68
[<c059424d>] sk_common_release+0x23/0x90
[<c05d16be>] udp_lib_close+0x8/0xa
[<c05d8684>] inet_release+0x42/0x48
[<c0592599>] sock_release+0x14/0x60
[<c059299f>] sock_close+0x29/0x30
[<c046ef52>] __fput+0xad/0x15b
[<c046f1d9>] fput+0x17/0x19
[<c046c8c4>] filp_close+0x50/0x5a
[<c046da06>] sys_close+0x69/0x9f
[<c04048ce>] syscall_call+0x7/0xb
Signed-off-by: James Chapman <jchapman at katalix.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit b4496d44c6bd8b2da8d370ef49c4b008ce82370b
Merge: b9031d9d87b24e24cd32ea15b5f4220a1e8da909 4546002c813568829b70d00fab752de3999c3f1a
Author: David S. Miller <davem at davemloft.net>
Date: Wed Jun 4 14:58:13 2008 -0700
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
commit 4546002c813568829b70d00fab752de3999c3f1a
Author: Felix Homann <fexpop at onlinehome.de>
Date: Thu May 29 00:36:45 2008 -0700
USB ID for Philips CPWUA054/00 Wireless USB Adapter 11g
Enable the Philips CPWUA054/00 in p54usb.
Cc: Jeff Garzik <jeff at garzik.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit a3bafeedfff2ac5fa0a316bea4570e27900b6fcc
Author: Michael Buesch <mb at bu3sch.de>
Date: Mon Jun 2 16:15:23 2008 +0200
ssb: Fix context assertion in ssb_pcicore_dev_irqvecs_enable
This fixes a context assertion in ssb that makes b44 print
out warnings on resume.
This fixes the following kernel oops:
http://www.kerneloops.org/oops.php?number=12732
http://www.kerneloops.org/oops.php?number=11410
Signed-off-by: Michael Buesch <mb at bu3sch.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit a75eda43dc4a64d0bd0502da546871c01f70e899
Author: Holger Schurig <hs4233 at mail.mn-solutions.de>
Date: Fri May 30 14:53:22 2008 +0200
libertas: fix command size for CMD_802_11_SUBSCRIBE_EVENT
The size was two small by two bytes.
Signed-off-by: Holger Schurig
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit a6d4eae80157830af9c9d80de2daf6611696a34e
Author: Dan Williams <dcbw at redhat.com>
Date: Thu May 29 14:38:28 2008 -0400
ipw2200: expire and use oldest BSS on adhoc create
If there are no networks on the free list, expire the oldest one when
creating a new adhoc network. Because ipw2200 and the ieee80211 stack
don't actually cull old networks and place them back on the free list
unless they are needed for new probe responses, over time the free list
would become empty and creating an adhoc network would fail due to the !
list_empty(...) check.
Signed-off-by: Dan Williams <dcbw at redhat.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit b212f3378a9cfca4da52d7c7e6f79ead8ec287fc
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Wed May 28 12:40:39 2008 -0700
airo warning fix
WARNING: space prohibited between function name and open parenthesis '('
#22: FILE: drivers/net/wireless/airo.c:2907:
+ while ((IN4500 (ai, COMMAND) & COMMAND_BUSY) && (delay < 10000)) {
total: 0 errors, 1 warnings, 8 lines checked
./patches/wireless-airo-waitbusy-wont-delay.patch has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
Please run checkpatch prior to sending patches
Cc: Dan Williams <dcbw at redhat.com>
Cc: Roel Kluin <roel.kluin at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 48e6c51bd326ce9faf07fbdf84d361c9755b7035
Author: Michael Buesch <mb at bu3sch.de>
Date: Thu May 22 17:06:36 2008 +0200
b43legacy: Fix controller restart crash
This fixes a kernel crash on rmmod, in the case where the controller
was restarted before doing the rmmod.
Signed-off-by: Michael Buesch <mb at bu3sch.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit b9031d9d87b24e24cd32ea15b5f4220a1e8da909
Author: Vlad Yasevich <vladislav.yasevich at hp.com>
Date: Wed Jun 4 12:40:15 2008 -0700
sctp: Fix ECN markings for IPv6
Commit e9df2e8fd8fbc95c57dbd1d33dada66c4627b44c ("[IPV6]: Use
appropriate sock tclass setting for routing lookup.") also changed the
way that ECN capable transports mark this capability in IPv6. As a
result, SCTP was not marking ECN capablity because the traffic class
was never set. This patch brings back the markings for IPv6 traffic.
Signed-off-by: Vlad Yasevich <vladislav.yasevich at hp.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 8b750ce54bd8ab5f75d519ee450e1b0c5226ebe9
Author: Vlad Yasevich <vladislav.yasevich at hp.com>
Date: Wed Jun 4 12:39:36 2008 -0700
sctp: Flush the queue only once during fast retransmit.
When fast retransmit is triggered by a sack, we should flush the queue
only once so that only 1 retransmit happens. Also, since we could
potentially have non-fast-rtx chunks on the retransmit queue, we need
make sure any chunks eligable for fast retransmit are sent first
during fast retransmission.
Signed-off-by: Vlad Yasevich <vladislav.yasevich at hp.com>
Tested-by: Wei Yongjun <yjwei at cn.fujitsu.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 62aeaff5ccd96462b7077046357a6d7886175a57
Author: Vlad Yasevich <vladislav.yasevich at hp.com>
Date: Wed Jun 4 12:39:11 2008 -0700
sctp: Start T3-RTX timer when fast retransmitting lowest TSN
When we are trying to fast retransmit the lowest outstanding TSN, we
need to restart the T3-RTX timer, so that subsequent timeouts will
correctly tag all the packets necessary for retransmissions.
Signed-off-by: Vlad Yasevich <vladislav.yasevich at hp.com>
Tested-by: Wei Yongjun <yjwei at cn.fujitsu.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit a6465234814efda9ed1dccdba852953f7508e827
Author: Vlad Yasevich <vladislav.yasevich at hp.com>
Date: Wed Jun 4 12:38:43 2008 -0700
sctp: Correctly implement Fast Recovery cwnd manipulations.
Correctly keep track of Fast Recovery state and do not reduce
congestion window multiple times during sucht state.
Signed-off-by: Vlad Yasevich <vladislav.yasevich at hp.com>
Tested-by: Wei Yongjun <yjwei at cn.fujitsu.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 159c6bea37c54dfae44409467e0f17600722d541
Author: Gui Jianfeng <guijianfeng at cn.fujitsu.com>
Date: Wed Jun 4 12:38:07 2008 -0700
sctp: Move sctp_v4_dst_saddr out of loop
There's no need to execute sctp_v4_dst_saddr() for each
iteration, just move it out of loop.
Signed-off-by: Gui Jianfeng <guijianfeng at cn.fujitsu.com>
Signed-off-by: Vlad Yasevich <vladislav.yasevich at hp.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 4141ddc02a92a6e3e5793601554c6033e83c25b9
Author: Gui Jianfeng <guijianfeng at cn.fujitsu.com>
Date: Wed Jun 4 12:37:33 2008 -0700
sctp: retran_path update bug fix
If the current retran_path is the only active one, it should
update it to the the next inactive one.
Signed-off-by: Gui Jianfeng <guijianfeng at cn.fujitsu.com>
Signed-off-by: Vlad Yasevich <vladislav.yasevich at hp.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit aed5a833fb18123d7cfc6ce3810ab97efd4869b3
Merge: a6604471db5e7a33474a7f16c64d6b118fae3e74 9596cc826e2e52bfc318ca37a6c52fe3d72990a3
Author: David S. Miller <davem at davemloft.net>
Date: Wed Jun 4 12:10:21 2008 -0700
Merge branch 'net-2.6-misc-20080605a' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-fix
commit a6604471db5e7a33474a7f16c64d6b118fae3e74
Author: Ilpo Järvinen <ilpo.jarvinen at helsinki.fi>
Date: Wed Jun 4 12:07:44 2008 -0700
tcp: fix skb vs fack_count out-of-sync condition
This bug is able to corrupt fackets_out in very rare cases.
In order for this to cause corruption:
1) DSACK in the middle of previous SACK block must be generated.
2) In order to take that particular branch, part or all of the
DSACKed segment must already be SACKed so that we have that
in cache in the first place.
3) The new info must be top enough so that fackets_out will be
updated on this iteration.
...then fack_count is updated while skb wasn't, then we walk again
that particular segment thus updating fack_count twice for
a single skb and finally that value is assigned to fackets_out
by tcp_sacktag_one.
It is safe to call tcp_sacktag_one just once for a segment (at
DSACK), no need to call again for plain SACK.
Potential problem of the miscount are limited to premature entry
to recovery and to inflated reordering metric (which could even
cancel each other out in the most the luckiest scenarios :-)).
Both are quite insignificant in worst case too and there exists
also code to reset them (fackets_out once sacked_out becomes zero
and reordering metric on RTO).
This has been reported by a number of people, because it occurred
quite rarely, it has been very evasive. Andy Furniss was able to
get it to occur couple of times so that a bit more info was
collected about the problem using a debug patch, though it still
required lot of checking around. Thanks also to others who have
tried to help here.
This is listed as Bugzilla #10346. The bug was introduced by
me in commit 68f8353b48 ([TCP]: Rewrite SACK block processing &
sack_recv_cache use), I probably thought back then that there's
need to scan that entry twice or didn't dare to make it go
through it just once there. Going through twice would have
required restoring fack_count after the walk but as noted above,
I chose to drop the additional walk step altogether here.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen at helsinki.fi>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit c03e05d81d70879273488206bfcb1805ebca9612
Author: Mark Asselstine <mark.asselstine at windriver.com>
Date: Wed Jun 4 12:06:28 2008 -0700
sunhme: Cleanup use of deprecated calls to save_and_cli and restore_flags.
Make use of local_irq_save and local_irq_restore rather then the
deprecated save_and_cli and restore_flags calls.
Signed-off-by: Mark Asselstine <mark.asselstine at windriver.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit a13366c632132bb9f8f2950a79773d8f68f4871e
Author: Adrian-Ken Rueegsegger <rueegsegger at swiss-it.ch>
Date: Wed Jun 4 12:04:55 2008 -0700
xfrm: xfrm_algo: correct usage of RIPEMD-160
This patch fixes the usage of RIPEMD-160 in xfrm_algo which in turn
allows hmac(rmd160) to be used as authentication mechanism in IPsec
ESP and AH (see RFC 2857).
Signed-off-by: Adrian-Ken Rueegsegger <rueegsegger at swiss-it.ch>
Acked-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 9596cc826e2e52bfc318ca37a6c52fe3d72990a3
Author: Denis V. Lunev <den at openvz.org>
Date: Wed Jun 4 15:49:08 2008 +0400
[IPV6]: Do not change protocol for UDPv6 sockets with pending sent data.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
commit 36d926b94a9908937593e5669162305a071b9cc3
Author: Denis V. Lunev <den at openvz.org>
Date: Wed Jun 4 15:49:07 2008 +0400
[IPV6]: inet_sk(sk)->cork.opt leak
IPv6 UDP sockets wth IPv4 mapped address use udp_sendmsg to send the data
actually. In this case ip_flush_pending_frames should be called instead
of ip6_flush_pending_frames.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
commit 49d074f4009a7b5ce9c17b040f978abcb4d7f6f6
Author: Denis V. Lunev <den at openvz.org>
Date: Wed Jun 4 15:49:06 2008 +0400
[IPV6]: Do not change protocol for raw IPv6 sockets.
It is not allowed to change underlying protocol for
int fd = socket(PF_INET6, SOCK_RAW, IPPROTO_UDP);
Signed-off-by: Denis V. Lunev <den at openvz.org>
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
commit 91e1908f569dd96a25a3947de8771e6cc93999dd
Author: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: Wed Jun 4 13:02:49 2008 +0900
[IPV6] NETNS: Handle ancillary data in appropriate namespace.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
commit 187e38384c4abfbbb1b880fab234d16c2df23a25
Author: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: Wed Jun 4 13:01:37 2008 +0900
[IPV6]: Check outgoing interface even if source address is unspecified.
The outgoing interface index (ipi6_ifindex) in IPV6_PKTINFO
ancillary data, is not checked if the source address (ipi6_addr)
is unspecified. If the ipi6_ifindex is the not-exist interface,
it should be fail.
Based on patch from Shan Wei <shanwei at cn.fujitsu.com> and
Brian Haley <brian.haley at hp.com>.
Signed-off-by: Shan Wei <shanwei at cn.fujitsu.com>
Signed-off-by: Brian Haley <brian.haley at hp.com>
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
commit 95b496b66615d8c43f77702049b1bd01e2f06595
Author: Yang Hongyang <yanghy at cn.fujitsu.com>
Date: Wed May 28 16:27:28 2008 +0800
[IPV6]: Fix the data length of get destination options with short length
If get destination options with length which is not enough for that
option,getsockopt() will still return the real length of the option,
which is larger then the buffer space.
This is because ipv6_getsockopt_sticky() returns the real length of
the option.
This patch fix this problem.
Signed-off-by: Yang Hongyang <yanghy at cn.fujitsu.com>
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
commit 05335c2220c4911b69cb1bdd79e603ab08088372
Author: Yang Hongyang <yanghy at cn.fujitsu.com>
Date: Wed May 28 16:23:47 2008 +0800
[IPV6]: Fix the return value of get destination options with NULL data pointer
If we pass NULL data buffer to getsockopt(), it will return 0,
and the option length is set to -EFAULT:
getsockopt(sk, IPPROTO_IPV6, IPV6_DSTOPTS, NULL, &len);
This is because ipv6_getsockopt_sticky() will return -EFAULT or
-EINVAL if some error occur.
This patch fix this problem.
Signed-off-by: Yang Hongyang <yanghy at cn.fujitsu.com>
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
commit 4bed72e4f5502ea3322f0a00794815fa58951abe
Author: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: Tue May 27 17:37:49 2008 +0900
[IPV6] ADDRCONF: Allow longer lifetime on 64bit archs.
- Allow longer lifetimes (>= 0x7fffffff/HZ) on 64bit archs
by using unsigned long.
- Shadow this arithmetic overflow workaround by introducing
helper functions: addrconf_timeout_fixup() and
addrconf_finite_timeout().
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
commit baa2bfb8aef24bb7fe1875b256918724b3884662
Author: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: Fri May 30 11:35:03 2008 +0900
[IPV4] TUNNEL4: Fix incoming packet length check for inter-protocol tunnel.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
commit 82836372311a5cbf9cc5f4f47f9b56cb9edfe90d
Author: Colin <colins at sjtu.edu.cn>
Date: Tue May 27 00:04:43 2008 +0800
[IPV6] TUNNEL6: Fix incoming packet length check for inter-protocol tunnel.
I discover a strange behavior in [ipv4 in ipv6] tunnel. When IPv6 tunnel
payload is less than 40(0x28), packet can be sent to network, received in
physical interface, but not seen in IP tunnel interface. No counter increase
in tunnel interface.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
commit 24ef0da7b864435f221f668bc8a324160d063e78
Author: Thomas Graf <tgraf at suug.ch>
Date: Wed May 28 16:54:22 2008 +0200
[IPV6] ADDRCONF: Check range of prefix length
As of now, the prefix length is not vaildated when adding or deleting
addresses. The value is passed directly into the inet6_ifaddr structure
and later passed on to memcmp() as length indicator which relies on
the value never to exceed 128 (bits).
Due to the missing check, the currently code allows for any 8 bit
value to be passed on as prefix length while using the netlink
interface, and any 32 bit value while using the ioctl interface.
[Use unsigned int instead to generate better code - yoshfuji]
Signed-off-by: Thomas Graf <tgraf at suug.ch>
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
commit a3c960899e042bc1c2b730a2115fa32da7802039
Author: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: Wed Jun 4 01:30:25 2008 +0900
[IPV6] UDP: Possible dst leak in udpv6_sendmsg.
ip6_sk_dst_lookup returns held dst entry. It should be released
on all paths beyond this point. Add missed release when up->pending
is set.
Bug report and initial patch by Denis V. Lunev <den at openvz.org>.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Acked-by: Denis V. Lunev <den at openvz.org>
commit e51171019bb0e1f9fb57c25bd2e38ce652eaea27
Author: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
Date: Thu May 29 19:55:05 2008 +0900
[SCTP]: Fix NULL dereference of asoc.
Commit 7cbca67c073263c179f605bdbbdc565ab29d801d ("[IPV6]: Support
Source Address Selection API (RFC5014)") introduced NULL dereference
of asoc to sctp_v6_get_saddr in net/sctp/ipv6.c.
Pointed out by Johann Felix Soden <johfel at users.sourceforge.net>.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji at linux-ipv6.org>
commit 8b91ac09732895f928ed6107bda5318cf260520b
Merge: 8aca6cb1179ed9bef9351028c8d8af852903eae2 56997fa838e333cea33ab641d4aeedd23aef0eb1
Author: David S. Miller <davem at davemloft.net>
Date: Wed Jun 4 11:50:00 2008 -0700
Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
commit 8aca6cb1179ed9bef9351028c8d8af852903eae2
Author: Ilpo Järvinen <ilpo.jarvinen at helsinki.fi>
Date: Wed Jun 4 11:34:22 2008 -0700
tcp: Fix inconsistency source (CA_Open only when !tcp_left_out(tp))
It is possible that this skip path causes TCP to end up into an
invalid state where ca_state was left to CA_Open while some
segments already came into sacked_out. If next valid ACK doesn't
contain new SACK information TCP fails to enter into
tcp_fastretrans_alert(). Thus at least high_seq is set
incorrectly to a too high seqno because some new data segments
could be sent in between (and also, limited transmit is not
being correctly invoked there). Reordering in both directions
can easily cause this situation to occur.
I guess we would want to use tcp_moderate_cwnd(tp) there as well
as it may be possible to use this to trigger oversized burst to
network by sending an old ACK with huge amount of SACK info, but
I'm a bit unsure about its effects (mainly to FlightSize), so to
be on the safe side I just currently fixed it minimally to keep
TCP's state consistent (obviously, such nasty ACKs have been
possible this far). Though it seems that FlightSize is already
underestimated by some amount, so probably on the long term we
might want to trigger recovery there too, if appropriate, to make
FlightSize calculation to resemble reality at the time when the
losses where discovered (but such change scares me too much now
and requires some more thinking anyway how to do that as it
likely involves some code shuffling).
This bug was found by Brian Vowell while running my TCP debug
patch to find cause of another TCP issue (fackets_out
miscount).
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen at helsinki.fi>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit edeb280e49d38a5330db25463ef45f5466b0058a
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Jun 4 10:35:03 2008 -0700
Fix uart_set_ldisc() function type
Commit 64e9159f5d2c4edf5fa6425031e556f8fddaf7e6 ("serial_core:
uart_set_ldisc infrastructure") introduced the ability for low-level
serial drivers to be informed when the tty ldisc changes.
However, the actual tty-layer function that does this callback for
serial devices was declared with the wrong type, having a spurious and
unused 'ldisc' argument.
This fixed the resulting compiler warning by just removing it.
Acked-by: Blithering Idiot <alan at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b9c698964614f71b9c8afeca163a945b4c2e2d20
Author: Jarek Poplawski <jarkao2 at gmail.com>
Date: Wed Jun 4 09:58:27 2008 -0700
netfilter: nf_conntrack_ipv6: fix inconsistent lock state in nf_ct_frag6_gather()
[ 63.531438] =================================
[ 63.531520] [ INFO: inconsistent lock state ]
[ 63.531520] 2.6.26-rc4 #7
[ 63.531520] ---------------------------------
[ 63.531520] inconsistent {softirq-on-W} -> {in-softirq-W} usage.
[ 63.531520] tcpsic6/3864 [HC0[0]:SC1[1]:HE1:SE0] takes:
[ 63.531520] (&q->lock#2){-+..}, at: [<c07175b0>] ipv6_frag_rcv+0xd0/0xbd0
[ 63.531520] {softirq-on-W} state was registered at:
[ 63.531520] [<c0143bba>] __lock_acquire+0x3aa/0x1080
[ 63.531520] [<c0144906>] lock_acquire+0x76/0xa0
[ 63.531520] [<c07a8f0b>] _spin_lock+0x2b/0x40
[ 63.531520] [<c0727636>] nf_ct_frag6_gather+0x3f6/0x910
...
According to this and another similar lockdep report inet_fragment
locks are taken from nf_ct_frag6_gather() with softirqs enabled, but
these locks are mainly used in softirq context, so disabling BHs is
necessary.
Reported-and-tested-by: Eric Sesterhenn <snakebyte at gmx.de>
Signed-off-by: Jarek Poplawski <jarkao2 at gmail.com>
Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit d2ee3f2c4b1db1320c1efb4dcaceeaf6c7e6c2d3
Author: Dong Wei <dwei.zh at gmail.com>
Date: Wed Jun 4 09:57:51 2008 -0700
netfilter: xt_connlimit: fix accouning when receive RST packet in ESTABLISHED state
In xt_connlimit match module, the counter of an IP is decreased when
the TCP packet is go through the chain with ip_conntrack state TW.
Well, it's very natural that the server and client close the socket
with FIN packet. But when the client/server close the socket with RST
packet(using so_linger), the counter for this connection still exsit.
The following patch can fix it which is based on linux-2.6.25.4
Signed-off-by: Dong Wei <dwei.zh at gmail.com>
Acked-by: Jan Engelhardt <jengelh at medozas.de>
Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit d389c7d8988aecfdc06d9e9f9769af09e6592082
Merge: 4ded383569d6316d68d2aed298f8eb8d7bca37af 378bd6a5211f05d6d8eb3e78a92e2a197e456e4e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Jun 4 09:43:58 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
[ALSA] hda - COMPAL IFL90/JFL-92 laptop quirk
[ALSA] hda - Fix resume of auto-config mode with Realtek codecs
[ALSA] hda - Fix model for LG LS75 laptop
[ALSA] hda - Fix mic input on HP2133
[ALSA] ac97 - Fix ASUS A9T laptop output
commit 4ded383569d6316d68d2aed298f8eb8d7bca37af
Merge: e97dcb0eadbb821eccd549d4987b653cf61e2374 870568b39064cab2dd971fe57969916036982862
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Jun 4 09:15:51 2008 -0700
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip:
x86, fpu: fix CONFIG_PREEMPT=y corruption of application's FPU stack
suspend-vs-iommu: prevent suspend if we could not resume
x86: section mismatch fix
x86: fix Xorg crash with xf86MapVidMem error
x86: fix pointer type warning in arch/x86/mm/init_64.c:early_memtest
x86: fix bad pmd ffff810000207xxx(9090909090909090)
x86: ioremap fix failing nesting check
x86: fix broken math-emu with lazy allocation of fpu area
x86: enable preemption in delay
x86: disable preemption in native_smp_prepare_cpus
x86: fix APIC warning on 32bit v2
commit e97dcb0eadbb821eccd549d4987b653cf61e2374
Author: Casey Schaufler <casey at schaufler-ca.com>
Date: Mon Jun 2 10:04:32 2008 -0700
Smack: fuse mount hang fix
The d_instantiate hook for Smack can hang on the root inode of a
filesystem if the file system code has not really done all the set-up.
Fuse is known to encounter this problem.
This change detects an attempt to instantiate a root inode and addresses
it early in the processing, before any attempt is made to do something
that might hang.
Signed-off-by: Casey Schaufler <casey at schaufler-ca.com>
Tested-by: Luiz Fernando N. Capitulino <lcapitulino at mandriva.com.br>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 246dd412d31e4f5de1d43aa6422a325b785f36e4
Merge: 2d9b57fbec9fde4deea3686f3927204efa218c7f a57c1bade5a0ee5cd8b74502db9cbebb7f5780b2
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Jun 4 08:36:56 2008 -0700
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata-sff: Fix oops reported in kerneloops.org for pnp devices with no ctl
libata: kill unused constants
sata_mv: PHY_MODE4 cleanups
[libata] ata_piix: more acer short cable quirks
[libata] ACPI: Properly handle bay devices in dock stations
commit 2d9b57fbec9fde4deea3686f3927204efa218c7f
Merge: df6ab559bb1be44a78584e78ae7ad82d4e9e4f51 28d7647de2ee075aaed5ca835f445e885884f163
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Jun 4 08:36:09 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] qla2xxx: Update version number to 8.02.01-k4.
[SCSI] qla2xxx: Correct handling of AENs postings for vports.
[SCSI] qla2xxx: Revert "qla2xxx: Use proper HA during asynchronous event handling."
[SCSI] ibmvscsi: Non SCSI error status fixup
[SCSI] fusion mpt: fix target missing after resetting external raid
[SCSI] fix intermittent oops in scsi_bus_uevent
[SCSI] qla2xxx: Update version number to 8.02.01-k3.
[SCSI] qla2xxx: Revert "qla2xxx: Validate mid-layer 'underflow' during check-condition handling."
[SCSI] qla2xxx: Disable local-interrupts while polling for RISC status.
[SCSI] qla2xxx: Extend the 'fw_dump' SYSFS node the ability to initiate a firmware dump.
[SCSI] qla2xxx: Don't depend on mailbox return values while enabling FCE tracing.
[SCSI] qla2xxx: Convert vport_sem to a mutex
[SCSI] qla2xxx: firmware semaphore to mutex
[SCSI] qla2xxx: Correct locking within MSI-X interrupt handlers.
[SCSI] qla2xxx: Display driver version at module init-time.
[SCSI] qla2xxx: Return correct port_type to FC-transport for Vports.
commit df6ab559bb1be44a78584e78ae7ad82d4e9e4f51
Merge: 3b5b60b821e0e97531df9b0ba295283ab5a8859a 39eb41ef0732a02acb3babe5ba1df92d76b9fb8f
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Jun 4 08:35:44 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.26
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.26:
sh: Add defconfig for RSK7203.
sh: Update SE7206 defconfig.
sh: Disable 4KSTACKS on nommu.
sh: fix miscompilation of ip_fast_csum with gcc >= 4.3
sh: module.c use kernel unaligned helpers
sh/kernel/cpu/irq/intc-sh5.c build fix
commit 3b5b60b821e0e97531df9b0ba295283ab5a8859a
Merge: d430a227d272fa514bade388bf511dba4ec2962a b33cb815b565a94c654a0fe8e62e36f5b4053888
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Jun 4 08:08:27 2008 -0700
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
kgdbts: Use HW breakpoints with CONFIG_DEBUG_RODATA
kgdb: use common ascii helpers and put_unaligned_be32 helper
commit d430a227d272fa514bade388bf511dba4ec2962a
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Mon Jun 2 10:59:02 2008 +0100
bogus format in ip6mr
ptrdiff_t is %t..., not %Z...
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c409d52bd1f16b37d35a50162cbf6401011f1135
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Mon Jun 2 10:59:02 2008 +0100
celleb_scc_pciex endianness misannotations
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9307245765108a7ec827ef936560f333447c45ef
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Mon Jun 2 10:59:02 2008 +0100
mpc52xx_gpio iomem annotations
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1a79d1c37178935a3092f73c8832933e9fed1f66
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Mon Jun 2 10:59:02 2008 +0100
s2io iomem annotations
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1d92cfd54a51ff1b9593019fdde56793b66ba6a9
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Mon Jun 2 10:59:02 2008 +0100
cifs endianness fixes
__le16 fields used as host-endian.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Acked-by: Steve French <smfrench at gmail.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6399e7acbf9193c7d48827329ca592a1c8dc9e69
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Mon Jun 2 10:59:02 2008 +0100
isp1760-if iomem annotations
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit fa4144b758d58341d4e082ac2af259e97fbcbeee
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Mon Jun 2 10:59:02 2008 +0100
cdc-wdm endianness fixes
* wMaxPacketSize is le16; copying it to a field of local structure and then
using that field as host-endian (size of object to be allocated) is broken.
* bMaxPacketSize0 is 8-bit; feeding it to le16_to_cpu() is bogus and since the
result is used as host-endian, it's not even misspelled cpu_to_le16().
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 76e6f2526ff69eba466f583d94beb7cf6b0bddd6
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Mon Jun 2 10:59:02 2008 +0100
usb/c67x00 endianness annotations
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a064d5bdd0c9602e4cd930ad949392640b37dda7
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Mon Jun 2 10:59:02 2008 +0100
ibmaem endianness annotations
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 870568b39064cab2dd971fe57969916036982862
Author: Suresh Siddha <suresh.b.siddha at intel.com>
Date: Mon Jun 2 15:57:27 2008 -0700
x86, fpu: fix CONFIG_PREEMPT=y corruption of application's FPU stack
Jürgen Mell reported an FPU state corruption bug under CONFIG_PREEMPT,
and bisected it to commit v2.6.19-1363-gacc2076, "i386: add sleazy FPU
optimization".
Add tsk_used_math() checks to prevent calling math_state_restore()
which can sleep in the case of !tsk_used_math(). This prevents
making a blocking call in __switch_to().
Apparently "fpu_counter > 5" check is not enough, as in some signal handling
and fork/exec scenarios, fpu_counter > 5 and !tsk_used_math() is possible.
It's a side effect though. This is the failing scenario:
process 'A' in save_i387_ia32() just after clear_used_math()
Got an interrupt and pre-empted out.
At the next context switch to process 'A' again, kernel tries to restore
the math state proactively and sees a fpu_counter > 0 and !tsk_used_math()
This results in init_fpu() during the __switch_to()'s math_state_restore()
And resulting in fpu corruption which will be saved/restored
(save_i387_fxsave and restore_i387_fxsave) during the remaining
part of the signal handling after the context switch.
Bisected-by: Jürgen Mell <j.mell at t-online.de>
Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
Tested-by: Jürgen Mell <j.mell at t-online.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Cc: stable at kernel.org
commit cd76374e9de4501acc74f833dc6cb5e7a5dca115
Author: Pavel Machek <pavel at suse.cz>
Date: Thu May 29 00:30:21 2008 -0700
suspend-vs-iommu: prevent suspend if we could not resume
iommu/gart support misses suspend/resume code, which can do bad stuff,
including memory corruption on resume. Prevent system suspend in case we
would be unable to resume.
Signed-off-by: Pavel Machek <pavel at suse.cz>
Tested-by: Patrick <ragamuffin at datacomm.ch>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit be524fb96081e9e511d993ebf39b05a32b19476e
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Thu May 29 00:01:28 2008 -0700
x86: section mismatch fix
Fix this:
WARNING: vmlinux.o(.text+0x114bb): Section mismatch in reference from
the function nopat() to the function .cpuinit.text:pat_disable()
The function nopat() references
the function __cpuinit pat_disable().
This is often because nopat lacks a __cpuinit
annotation or the annotation of pat_disable is wrong.
Reported-by: "Fabio Comolli" <fabio.comolli at gmail.com>
Cc: Sam Ravnborg <sam at ravnborg.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 282c454cd3a7041f59a37112bb2f82263bc38f6c
Author: Venki Pallipadi <venkatesh.pallipadi at intel.com>
Date: Thu May 29 12:01:44 2008 -0700
x86: fix Xorg crash with xf86MapVidMem error
Clarify the usage of mtrr_lookup() in PAT code, and to make PAT code
resilient to mtrr lookup problems.
Specifically, pat_x_mtrr_type() is restructured to highlight, under what
conditions we look for mtrr hint. pat_x_mtrr_type() uses a default type
when there are any errors in mtrr lookup (still maintaining the pat
consistency). And, reserve_memtype() highlights its usage ot mtrr_lookup
for request type of '-1' and also defaults in a sane way on any mtrr
lookup failure.
pat.c looks at mtrr type of a range to get a hint on what mapping type
to request when user/API: (1) hasn't specified any type (/dev/mem
mapping) and we do not want to take performance hit by always mapping
UC_MINUS. This will be the case for /dev/mem mappings used to map BIOS
area or ACPI region which are WB'able. In this case, as long as MTRR is
not WB, PAT will request UC_MINUS for such mappings.
(2) user/API requests WB mapping while in reality MTRR may have UC or
WC. In this case, PAT can map as WB (without checking MTRR) and still
effective type will be UC or WC. But, a subsequent request to map same
region as UC or WC may fail, as the region will get trackked as WB in
PAT list. Looking at MTRR hint helps us to track based on effective type
rather than what user requested. Again, here mtrr_lookup is only used as
hint and we fallback to WB mapping (as requested by user) as default.
In both cases, after using the mtrr hint, we still go through the
memtype list to make sure there are no inconsistencies among multiple
users.
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
Tested-by: Rufus & Azrael <rufus-azrael at numericable.fr>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 511631011d39706ac81ee5e4c9084d61e5b4fd34
Author: Kevin Winchester <kjwinchester at gmail.com>
Date: Thu May 29 21:14:35 2008 -0300
x86: fix pointer type warning in arch/x86/mm/init_64.c:early_memtest
Changed the call to find_e820_area_size to pass u64 instead of unsigned long.
Signed-off-by: Kevin Winchester <kjwinchester at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 2884f110d5409714f3a04eeb6d2ecd77da66b242
Author: Hugh Dickins <hugh at veritas.com>
Date: Wed May 28 19:36:07 2008 +0100
x86: fix bad pmd ffff810000207xxx(9090909090909090)
OGAWA Hirofumi and Fede have reported rare pmd_ERROR messages:
mm/memory.c:127: bad pmd ffff810000207xxx(9090909090909090).
Initialization's cleanup_highmap was leaving alignment filler
behind in the pmd for MODULES_VADDR: when vmalloc's guard page
would occupy a new page table, it's not allocated, and then
module unload's vfree hits the bad 9090 pmd entry left over.
Signed-off-by: Hugh Dickins <hugh at veritas.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 226e9a93a253b7d8811b5ed9ac671c6c5a728022
Author: Ingo Molnar <mingo at elte.hu>
Date: Tue May 27 09:56:49 2008 +0200
x86: ioremap fix failing nesting check
Mika Kukkonen noticed that the nesting check in early_iounmap() is not
actually done.
Reported-by: Mika Kukkonen <mikukkon at srv1-m700-lanp.koti>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Cc: torvalds at linux-foundation.org
Cc: arjan at linux.intel.com
Cc: mikukkon at iki.fi
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit e8a496ac8cd00cabbdaa373db4818a9ad19a1c5a
Author: Suresh Siddha <suresh.b.siddha at intel.com>
Date: Fri May 23 16:26:37 2008 -0700
x86: fix broken math-emu with lazy allocation of fpu area
Fix the math emulation that got broken with the recent lazy allocation of FPU
area. init_fpu() need to be added for the math-emulation path aswell
for the FPU area allocation.
math emulation enabled kernel booted fine with this, in the presence
of "no387 nofxsr" boot param.
Signed-off-by: Suresh Siddha <suresh.b.siddha at intel.com>
Cc: hpa at zytor.com
Cc: mingo at elte.hu
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 5c1ea08215f1f830dfaf4819a5f22efca41c3832
Author: Steven Rostedt <rostedt at goodmis.org>
Date: Sun May 25 11:13:32 2008 -0400
x86: enable preemption in delay
The RT team has been searching for a nasty latency. This latency shows
up out of the blue and has been seen to be as big as 5ms!
Using ftrace I found the cause of the latency.
pcscd-2995 3dNh1 52360300us : irq_exit (smp_apic_timer_interrupt)
pcscd-2995 3dN.2 52360301us : idle_cpu (irq_exit)
pcscd-2995 3dN.2 52360301us : rcu_irq_exit (irq_exit)
pcscd-2995 3dN.1 52360771us : smp_apic_timer_interrupt (apic_timer_interrupt
)
pcscd-2995 3dN.1 52360771us : exit_idle (smp_apic_timer_interrupt)
Here's an example of a 400 us latency. pcscd took a timer interrupt and
returned with "need resched" enabled, but did not reschedule until after
the next interrupt came in at 52360771us 400us later!
At first I thought we somehow missed a preemption check in entry.S. But
I also noticed that this always seemed to happen during a __delay call.
pcscd-2995 3dN.2 52360836us : rcu_irq_exit (irq_exit)
pcscd-2995 3.N.. 52361265us : preempt_schedule (__delay)
Looking at the x86 delay, I found my problem.
In git commit 35d5d08a085c56f153458c3f5d8ce24123617faf, Andrew Morton
placed preempt_disable around the entire delay due to TSC's not working
nicely on SMP. Unfortunately for those that care about latencies this
is devastating! Especially when we have callers to mdelay(8).
Here I enable preemption during the loop and account for anytime the task
migrates to a new CPU. The delay asked for may be extended a bit by
the migration, but delay only guarantees that it will delay for that minimum
time. Delaying longer should not be an issue.
[
Thanks to Thomas Gleixner for spotting that cpu wasn't updated,
and to place the rep_nop between preempt_enabled/disable.
]
Signed-off-by: Steven Rostedt <srostedt at redhat.com>
Cc: akpm at osdl.org
Cc: Clark Williams <clark.williams at gmail.com>
Cc: Peter Zijlstra <peterz at infradead.org>
Cc: "Luis Claudio R. Goncalves" <lclaudio at uudg.org>
Cc: Gregory Haskins <ghaskins at novell.com>
Cc: Linus Torvalds <torvalds at linux-foundation.org>
Cc: Andi Kleen <andi-suse at firstfloor.org>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit deef325086c3897393b8f7d6bccd03405244fe18
Author: Ingo Molnar <mingo at elte.hu>
Date: Mon May 12 15:44:38 2008 +0200
x86: disable preemption in native_smp_prepare_cpus
Priit Laes reported the following warning:
Call Trace:
[<ffffffff8022f1e1>] warn_on_slowpath+0x51/0x63
[<ffffffff80282e48>] sys_ioctl+0x2d/0x5d
[<ffffffff805185ff>] _spin_lock+0xe/0x24
[<ffffffff80227459>] task_rq_lock+0x3d/0x73
[<ffffffff805133c3>] set_cpu_sibling_map+0x336/0x350
[<ffffffff8021c1b8>] read_apic_id+0x30/0x62
[<ffffffff806d921d>] verify_local_APIC+0x90/0x138
[<ffffffff806d84b5>] native_smp_prepare_cpus+0x1f9/0x305
[<ffffffff806ce7b1>] kernel_init+0x59/0x2d9
[<ffffffff80518a26>] _spin_unlock_irq+0x11/0x2b
[<ffffffff8020bf48>] child_rip+0xa/0x12
[<ffffffff806ce758>] kernel_init+0x0/0x2d9
[<ffffffff8020bf3e>] child_rip+0x0/0x12
fix this by generally disabling preemption in native_smp_prepare_cpus().
Reported-and-bisected-by: Priit Laes <plaes at plaes.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit fb3bbd6a663fe972611676381adc4c60ddfe61ac
Author: Yinghai Lu <yhlu.kernel at gmail.com>
Date: Thu May 22 18:22:30 2008 -0700
x86: fix APIC warning on 32bit v2
for http://bugzilla.kernel.org/show_bug.cgi?id=10613
BIOS bug, APIC version is 0 for CPU#0! fixing up to 0x10. (tell your hw vendor)
v2: fix 64 bit compilation
Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
Cc: Andrew Morton <akpm at linux-foundation.org>
Cc: "Rafael J. Wysocki" <rjw at sisk.pl>
Cc: Gabriel C <nix.or.die at googlemail.com>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit a57c1bade5a0ee5cd8b74502db9cbebb7f5780b2
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Thu May 29 22:10:58 2008 +0100
libata-sff: Fix oops reported in kerneloops.org for pnp devices with no ctl
- Make ata_sff_altstatus private so nobody uses it by mistake
- Drop the 400nS delay from it
Add
ata_sff_irq_status - encapsulates the IRQ check logic
This function keeps the existing behaviour for altstatus using devices. I
actually suspect the logic was wrong before the changes but -rc isn't the
time to play with that
ata_sff_sync - ensure writes hit the device
Really we want an io* operation for 'is posted' eg ioisposted(ioaddr) so
that we can fix the nasty delay this causes on most systems.
- ata_sff_pause - 400nS delay
Ensure the command hit the device and delay 400nS
- ata_sff_dma_pause
Ensure the I/O hit the device and enforce an HDMA1:0 transition delay.
Requires altstatus register exists, BUG if not so we don't risk
corruption in MWDMA modes. (UDMA the checksum will save your backside in
theory)
The only other complication then is devices with their own handlers.
rb532 can use dma_pause but scc needs to access its own altstatus
register for internal errata workarounds so directly call the drivers own
altstatus function.
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 4f0ebe3cc57f18ba26317b56b80b108c2848b1de
Author: Tejun Heo <htejun at gmail.com>
Date: Tue May 20 02:17:50 2008 +0900
libata: kill unused constants
Kill a few unused constants.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit ba069e376cc0801cd28352ca5986ce20413acb21
Author: Mark Lord <liml at rtr.ca>
Date: Sat May 31 16:46:34 2008 -0400
sata_mv: PHY_MODE4 cleanups
The handling for PHY_MODE4 was originally just cloned from the
Marvell proprietary driver (with their blessing).
But we can do better than that.
Tidy things up with some judicious mask definitions, to improve maintainability.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit e1fefea9cc4bc231b5c23fe19e3682fe061dc097
Author: Colin Ian King <colin.king at canonical.com>
Date: Tue Jun 3 18:59:02 2008 +0200
[libata] ata_piix: more acer short cable quirks
Add ICH6 on ACER Aspire 1694WLMi to list of laptops that use short cables
rather than 80 wire
OriginalAuthor: Tiago Sousa
OriginalLocation: http://launchpadlibrarian.net/11627664/new.ich_laptop.short.cables.diff
Bug: #187121
Signed-off-by: Colin Ian King <colin.king at canonical.com>
Signed-off-by: maximilian attems <max at stro.at>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 664d080c41463570b95717b5ad86e79dc1be0877
Author: Holger Macht <hmacht at suse.de>
Date: Tue Jun 3 20:27:59 2008 +0200
[libata] ACPI: Properly handle bay devices in dock stations
* Differentiate between bay devices in dock stations and others:
- When an ACPI_NOTIFY_EJECT_REQUEST appears, just signal uevent to
userspace (that is when the optional eject button on a bay device is
pressed/pulled) giving the possibility to unmount file systems and to
clean up. Also, only send uevent in case we get an EJECT_REQUEST
without doing anything else. In other cases, you'll get an add/remove
event because libata attaches/detaches the device.
- In case of a dock event, which in turn signals an
ACPI_NOTIFY_EJECT_REQUEST, immediately detach the device, because it
may already have been gone
* In case of an ACPI_NOTIFY_DEVICE/BUS_CHECK, evaluate _STA to check if
the device has been plugged or unplugged. If plugged, hotplug it, if
unplugged, just signal event to userspace
(initial patch by Matthew Garrett <mjg59 at srcf.ucam.org>)
* Call ACPI _EJ0 for detached devices
Signed-off-by: Holger Macht <hmacht at suse.de>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 378bd6a5211f05d6d8eb3e78a92e2a197e456e4e
Author: Tony Vroon <tony at linx.net>
Date: Wed Jun 4 12:08:30 2008 +0200
[ALSA] hda - COMPAL IFL90/JFL-92 laptop quirk
Use quirk table to assign ALC268_TOSHIBA to COMPAL IFL90/JFL-92 laptops.
No analog output on autoprobe.
Signed-off-by: Tony Vroon <tony at linx.net>
Tested-by: Guri <gurashka at gmail.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit ab32cd793dca21eec846a8204390d9594ed994d5
Author: Thomas Graf <tgraf at suug.ch>
Date: Tue Jun 3 16:37:33 2008 -0700
route: Remove unused ifa_anycast field
The field was supposed to allow the creation of an anycast route by
assigning an anycast address to an address prefix. It was never
implemented so this field is unused and serves no purpose. Remove it.
Signed-off-by: Thomas Graf <tgraf at suug.ch>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit bc3ed28caaef55e7e3a9316464256353c5f9b1df
Author: Thomas Graf <tgraf at suug.ch>
Date: Tue Jun 3 16:36:54 2008 -0700
netlink: Improve returned error codes
Make nlmsg_trim(), nlmsg_cancel(), genlmsg_cancel(), and
nla_nest_cancel() void functions.
Return -EMSGSIZE instead of -1 if the provided message buffer is not
big enough.
Signed-off-by: Thomas Graf <tgraf at suug.ch>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 1f9d11c7c99da706e33646c3a9080dd5a8ef9a0b
Author: Thomas Graf <tgraf at suug.ch>
Date: Tue Jun 3 16:36:27 2008 -0700
route: Mark unused routing attributes as such
Also removes an unused policy entry for an attribute which is
only used in kernel->user direction.
Signed-off-by: Thomas Graf <tgraf at suug.ch>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 51b77cae0d5aa8e1546fca855dcfe48ddfadfa9c
Author: Thomas Graf <tgraf at suug.ch>
Date: Tue Jun 3 16:36:01 2008 -0700
route: Mark unused route cache flags as such.
Also removes an obsolete check for the unused flag RTCF_MASQ.
Signed-off-by: Thomas Graf <tgraf at suug.ch>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 7557af25155a82ac2dad73eec6b0166868bf8ea2
Author: Brice Goglin <Brice.Goglin at inria.fr>
Date: Tue Jun 3 16:07:45 2008 -0700
net_dma: remove duplicate assignment in dma_skb_copy_datagram_iovec
No need to compute copy twice in the frags loop in
dma_skb_copy_datagram_iovec().
Signed-off-by: Brice Goglin <Brice.Goglin at inria.fr>
Acked-by: Shannon Nelson <shannon.nelson at intel.com>
Signed-off-by: Maciej Sosnowski <maciej.sosnowski at intel.com>
Signed-off-by: Dan Williams <dan.j.williams at intel.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit b9f5f52cca3e94f1e7509f366aa250ebbe1ed0b5
Author: Stephen Hemminger <shemminger at vyatta.com>
Date: Tue Jun 3 16:03:15 2008 -0700
net: neighbour table ABI problem
The neighbor table time of last use information is returned in the
incorrect unit. Kernel to user space ABI's need to use USER_HZ (or
milliseconds), otherwise the application has to try and discover the
real system HZ value which is problematic. Linux has standardized on
keeping USER_HZ consistent (100hz) even when kernel is running
internally at some other value.
This change is small, but it breaks the ABI for older version of
iproute2 utilities. But these utilities are already broken since they
are looking at the psched_hz values which are completely different. So
let's just go ahead and fix both kernel and user space. Older
utilities will just print wrong values.
Signed-off-by: Stephen Hemminger <shemminger at vyatta.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 57c511d8d47caeeae375cb8106662c0bd6a7e7e0
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Jun 3 16:00:01 2008 -0700
bridge: update URL
This patch updates the URL of the bridge homepage.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 399dc43bc29fe1ac19340c56c0df84aa0ea53c85
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date: Tue Jun 3 15:21:21 2008 -0700
sparc: switch /proc/led to seq_file
Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 9ecad877948deb2871d29e03786a7d7911687009
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Tue Jun 3 15:18:36 2008 -0700
irda: Sock leak on error path in irda_create.
Bad type/protocol specified result in sk leak.
Fix is simple - release the sk if bad values are given,
but to make it possible just to call sk_free(), I move
some sk initialization a bit lower.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 7dccf1f4e1696c79bff064c3770867cc53cbc71c
Author: Jarek Poplawski <jarkao2 at gmail.com>
Date: Tue Jun 3 14:53:46 2008 -0700
ax25: Fix NULL pointer dereference and lockup.
From: Jarek Poplawski <jarkao2 at gmail.com>
There is only one function in AX25 calling skb_append(), and it really
looks suspicious: appends skb after previously enqueued one, but in
the meantime this previous skb could be removed from the queue.
This patch Fixes it the simple way, so this is not fully compatible with
the current method, but testing hasn't shown any problems.
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 537d59af73d894750cff14f90fe2b6d77fbab15b
Author: Dave Young <hidave.darkstar at gmail.com>
Date: Sun Jun 1 23:50:52 2008 -0700
bluetooth: rfcomm_dev_state_change deadlock fix
There's logic in __rfcomm_dlc_close:
rfcomm_dlc_lock(d);
d->state = BT_CLOSED;
d->state_changed(d, err);
rfcomm_dlc_unlock(d);
In rfcomm_dev_state_change, it's possible that rfcomm_dev_put try to
take the dlc lock, then we will deadlock.
Here fixed it by unlock dlc before rfcomm_dev_get in
rfcomm_dev_state_change.
why not unlock just before rfcomm_dev_put? it's because there's
another problem. rfcomm_dev_get/rfcomm_dev_del will take
rfcomm_dev_lock, but in rfcomm_dev_add the lock order is :
rfcomm_dev_lock --> dlc lock
so I unlock dlc before the taken of rfcomm_dev_lock.
Actually it's a regression caused by commit
1905f6c736cb618e07eca0c96e60e3c024023428 ("bluetooth :
__rfcomm_dlc_close lock fix"), the dlc state_change could be two
callbacks : rfcomm_sk_state_change and rfcomm_dev_state_change. I
missed the rfcomm_sk_state_change that time.
Thanks Arjan van de Ven <arjan at linux.intel.com> for the effort in
commit 4c8411f8c115def968820a4df6658ccfd55d7f1a ("bluetooth: fix
locking bug in the rfcomm socket cleanup handling") but he missed the
rfcomm_dev_state_change lock issue.
Signed-off-by: Dave Young <hidave.darkstar at gmail.com>
Acked-by: Marcel Holtmann <marcel at holtmann.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 64e9159f5d2c4edf5fa6425031e556f8fddaf7e6
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Tue Jun 3 15:18:54 2008 +0100
serial_core: uart_set_ldisc infrastructure
The tty layer provides a callback that is used when the line discipline
is changed. Some hardware uses this to configure hardware specific
features such as IrDA mode on serial ports. Unfortunately the serial
layer does not provide this feature or pass it down to drivers.
Blackfin used to hack around this by rewriting the tty ops, but those are
now properly shared and const so the hack fails. Instead provide the
proper operations.
This change plus a follow up from the Blackfin guys is needed to avoid
blackfin losing features in this release.
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 07bc76dfa19b10017b518dd9aa1b2719e8c863de
Author: Takashi Iwai <tiwai at suse.de>
Date: Tue Jun 3 14:46:34 2008 +0200
[ALSA] hda - Fix resume of auto-config mode with Realtek codecs
The auto-config mode of Realtek ALC codecs has a bug since 2.6.25
that it cannot resume properly. The problem was the wrong assignment
of init_hook that overrides the whole initialization.
Relevant bug reports:
http://bugzilla.kernel.org/show_bug.cgi?id=10662
https://bugzilla.novell.com/show_bug.cgi?id=385473
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 39eb41ef0732a02acb3babe5ba1df92d76b9fb8f
Author: Paul Mundt <lethal at linux-sh.org>
Date: Tue Jun 3 20:30:10 2008 +0900
sh: Add defconfig for RSK7203.
RSK7203 is supportable through the generic machvec, so we add a defconfig
for those bits. This gets updated with more complete board support later.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit f8cc3566d2e26ba1d9afd063ff5be40014e2e269
Author: Paul Mundt <lethal at linux-sh.org>
Date: Tue Jun 3 20:29:55 2008 +0900
sh: Update SE7206 defconfig.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 4b34fe156455d26ee6ed67b61539f136bf4e439c
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Mon Jun 2 16:42:49 2008 -0600
PNP: mark resources that conflict with PCI devices "disabled"
Both the PNP/PCI conflict detection quirk and the PNP system
driver must use the same mechanism to mark resources as disabled.
I think it's best to keep the resource and to keep the type bit
(IORESOURCE_MEM, etc), so that we match the list from firmware
as closely as possible.
Fixes this regression from 2.6.25: http://lkml.org/lkml/2008/6/1/82
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Tested-by: Avuton Olrich <avuton at gmail.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c3b25b32e8bef526cca748e1ba023c6bdd705a99
Merge: 28928b2f1d769abdc173c96e2632d30cbde9ec4a c4913c7b71abc79b008a3c118628cfb59bdb0efc
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jun 2 15:30:44 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
[CRYPTO] cts: Init SG tables
commit 28928b2f1d769abdc173c96e2632d30cbde9ec4a
Merge: 63e14626eddb534ab429e9c2b95d3f7038b596b6 0f475b2abed6cbccee1da20a0bef2895eb2a0edd
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jun 2 15:28:45 2008 -0700
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
[PATCH 3/3] ocfs2/net: Silence build warnings
[PATCH 2/3] ocfs2/dlm: Silence build warnings
[PATCH 1/3] ocfs2/net: Silence build warnings
ocfs2: Rename 'user_stack' plugin structure to 'ocfs2_user_plugin'
commit 63e14626eddb534ab429e9c2b95d3f7038b596b6
Author: Anton Vorontsov <avorontsov at ru.mvista.com>
Date: Sun Jun 1 11:49:32 2008 +0200
mmc_spi: mmc_spi.h should include linux/interrupts.h
Since mmc_spi.h uses irqreturn_t type, it should include appropriate
header, otherwise build will break if users didn't include it (some of
them do not use interrupts).
Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b09916e4f07de1cb2259cb01ec31e6ce535471bc
Merge: 00e98a9992641a14ace0bbc2dfcbc4e856ac3fd3 96d97f262aa6120f8dd8e8e9c7a0b0677de7e29e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jun 2 15:26:02 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
kbuild: fix $(src) assignmnet with external modules
commit 00e98a9992641a14ace0bbc2dfcbc4e856ac3fd3
Merge: f365ad5fc001cbd02968a376e0aecffe52ce79e1 a4ed1e41a734d77c9a83a88a8736e19b68e6a2a0
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jun 2 15:25:27 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
8250 Serial Driver: revert extra IRQ flag definition patch
Blackfin arch: update anomaly headers from toolchain trunk
Blackfin arch: Remove bad and usless code
Blackfin arch: Fix bug - set corret SSEL and IRQ to enable AD7877 on BF527
Blackfin arch: Fix typo. it should be _outsw_8
Blackfin arch: Cleanup no functional changes
commit f365ad5fc001cbd02968a376e0aecffe52ce79e1
Merge: 61ac7bf538db2044d0238fcd87b3d9df59294bf2 9c8b28c2ef532c2cf32b59aaa0bc07eb3b866ef7
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jun 2 15:25:03 2008 -0700
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Fix DMA nodes in the MPC8610 HPCD device tree
[POWERPC] Export empty_zero_page and copy_page in arch/ppc
[POWERPC] Add "memory" clobber to MMIO accessors
[POWERPC] pasemi: update pasemi_defconfig, enable electra_cf
electra_cf: Add MODULE_DEVICE_TABLE()
commit c4913c7b71abc79b008a3c118628cfb59bdb0efc
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date: Mon Jun 2 15:46:51 2008 +1000
[CRYPTO] cts: Init SG tables
Steps to reproduce:
modprobe tcrypt # with CONFIG_DEBUG_SG=y
testing cts(cbc(aes)) encryption
test 1 (128 bit key):
------------[ cut here ]------------
kernel BUG at include/linux/scatterlist.h:65!
invalid opcode: 0000 [1] PREEMPT SMP DEBUG_PAGEALLOC
CPU 0
Modules linked in: tea xts twofish twofish_common tcrypt(+) [maaaany]
Pid: 16151, comm: modprobe Not tainted 2.6.26-rc4-fat #7
RIP: 0010:[<ffffffffa0bf032e>] [<ffffffffa0bf032e>] :cts:cts_cbc_encrypt+0x151/0x355
RSP: 0018:ffff81016f497a88 EFLAGS: 00010286
RAX: ffffe20009535d58 RBX: ffff81016f497af0 RCX: 0000000087654321
RDX: ffff8100010d4f28 RSI: ffff81016f497ee8 RDI: ffff81016f497ac0
RBP: ffff81016f497c38 R08: 0000000000000000 R09: 0000000000000011
R10: ffffffff00000008 R11: ffff8100010d4f28 R12: ffff81016f497ac0
R13: ffff81016f497b30 R14: 0000000000000010 R15: 0000000000000010
FS: 00007fac6fa276f0(0000) GS:ffffffff8060e000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b
CR2: 00007f12ca7cc000 CR3: 000000016f441000 CR4: 00000000000026e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000ffff4ff0 DR7: 0000000000000400
Process modprobe (pid: 16151, threadinfo ffff81016f496000, task ffff8101755b4ae0)
Stack: 0000000000000001 ffff81016f496000 ffffffff80719f78 0000000000000001
0000000000000001 ffffffff8020c87c ffff81016f99c918 20646c756f772049
65687420656b696c 0000000000000020 0000000000000000 0000000033341102
Call Trace:
[<ffffffff8020c87c>] ? restore_args+0x0/0x30
[<ffffffffa04aa311>] ? :aes_generic:crypto_aes_expand_key+0x311/0x369
[<ffffffff802ab453>] ? check_object+0x15a/0x213
[<ffffffff802aad22>] ? init_object+0x6e/0x76
[<ffffffff802ac3ae>] ? __slab_free+0xfc/0x371
[<ffffffffa0bf05ed>] :cts:crypto_cts_encrypt+0xbb/0xca
[<ffffffffa07108de>] ? :crypto_blkcipher:setkey+0xc7/0xec
[<ffffffffa07110b8>] :crypto_blkcipher:async_encrypt+0x38/0x3a
[<ffffffffa2ce9341>] :tcrypt:test_cipher+0x261/0x7c6
[<ffffffffa2cfd9df>] :tcrypt:tcrypt_mod_init+0x9df/0x1b30
[<ffffffff80261e35>] sys_init_module+0x9e/0x1b2
[<ffffffff8020c15a>] system_call_after_swapgs+0x8a/0x8f
Code: 45 c0 e8 aa 24 63 df 48 c1 e8 0c 48 b9 00 00 00 00 00 e2 ff ff 48 8b 55 88 48 6b c0 68 48 01 c8 b9 21 43 65 87 48 39 4d 80 74 04 <0f> 0b eb fe f6 c2 01 74 04 0f 0b eb fe 83 e2 03 4c 89 ef 44 89
RIP [<ffffffffa0bf032e>] :cts:cts_cbc_encrypt+0x151/0x355
RSP <ffff81016f497a88>
---[ end trace e8bahiarjand37fd ]---
Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
commit 1f8404ea5fd8c408d0a7c12a88091dffb7b6768b
Author: Paul Mundt <lethal at linux-sh.org>
Date: Mon Jun 2 13:48:59 2008 +0900
sh: Disable 4KSTACKS on nommu.
4k stacks on nommu ends up blowing up with all sorts of interesting
slab corruption. Disable this by default unless BROKEN is also
enabled.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit d02d6be5d52a98be32c93d2ea7a0068991774a20
Author: Paul Mundt <lethal at linux-sh.org>
Date: Mon Jun 2 12:40:14 2008 +0900
sh: fix miscompilation of ip_fast_csum with gcc >= 4.3
As noted by Matthew Wilcox:
Kyle McMartin just tracked down a bug on parisc to a missing
"memory" clobber in the inline assembly implementation of
ip_fast_csum. The FRV, SH and Xtensa ports are also missing a
memory clobber, so I thought it would be polite to let you know.
The bug manifests as dropped network packets (obviously they have
the wrong checksum). It started appearing for parisc with GCC 4.3.
The GCC manual says:
If your assembler instructions access memory in an unpredictable
fashion, add `memory' to the list of clobbered registers. This
will cause GCC to not keep memory values cached in registers
across the assembler instruction and not optimize stores or loads
to that memory.
I see that FRV has a 400 byte memory output which may prevent this
problem from appearing, but SH and Xtensa have nothing to prevent
this bug. Hope this saves you a few days of debugging.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 1f9d29493992ddd6af6b3e313a603770f29c0408
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Wed May 28 16:38:17 2008 -0700
sh: module.c use kernel unaligned helpers
Replace the COPY_UNALIGNED_WORD helper.
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 2beb0e2893b900fa5fb07ccf73a976c06a93b764
Author: Adrian Bunk <bunk at kernel.org>
Date: Fri May 30 01:04:49 2008 +0300
sh/kernel/cpu/irq/intc-sh5.c build fix
This patch fixes the following build error caused by
commit a1dc4b59fa4af97ae68ee214d4d72bbd7c7ec1dc
(sh: intc_sh5 depends on cayman board for IRQ priority table.):
<-- snip -->
...
CC arch/sh/kernel/cpu/irq/intc-sh5.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/sh/kernel/cpu/irq/intc-sh5.c: In function 'plat_irq_setup':
/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/sh/kernel/cpu/irq/intc-sh5.c:257: error: expected declaration or statement at end of input
make[4]: *** [arch/sh/kernel/cpu/irq/intc-sh5.o] Error 1
<-- snip -->
Reported-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 96d97f262aa6120f8dd8e8e9c7a0b0677de7e29e
Author: Sam Ravnborg <sam at ravnborg.org>
Date: Sat May 31 22:28:40 2008 +0200
kbuild: fix $(src) assignmnet with external modules
When we introduced support for KBUILD_EXTRA_SYMBOLS
we started to include the externam module's kbuild
file when doing the final modpost step.
As external modules often do:
ccflags-y := -I$(src)
We had problems because $(src) was unassinged and
gcc then used the next parameter for -I resulting in
strange build failures.
Fix is to assign $(src) and $(obj) when building
external modules.
This fixes: http://bugzilla.kernel.org/show_bug.cgi?id=10798
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Cc: Tvrtko <tvrtko.ursulin at sophos.com>
Cc: Andrea Arcangeli <andrea at qumranet.com>
Cc: "Rafael J. Wysocki" <rjw at sisk.pl>
commit a4ed1e41a734d77c9a83a88a8736e19b68e6a2a0
Author: Bryan Wu <cooloney at kernel.org>
Date: Sat May 31 16:10:04 2008 +0800
8250 Serial Driver: revert extra IRQ flag definition patch
As Russell pointed out, original patch will break some serial configurations
because of the dependency of the <asm/serial.h> header file.
Revert it first and try to find out other solution later
Cc: Javier Herrero <jherrero at hvsistemas.es>
Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
Cc: Russell King <rmk+lkml at arm.linux.org.uk>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit a70ce072b3883e431575449f3e294c27235590e5
Author: Mike Frysinger <vapier.adi at gmail.com>
Date: Sat May 31 15:47:17 2008 +0800
Blackfin arch: update anomaly headers from toolchain trunk
Signed-off-by: Mike Frysinger <vapier.adi at gmail.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit b06dcee9c8d24ef903dc0d192af22b8e179eef4b
Author: Michael Hennerich <michael.hennerich at analog.com>
Date: Sat May 31 15:35:40 2008 +0800
Blackfin arch: Remove bad and usless code
Signed-off-by: Michael Hennerich <michael.hennerich at analog.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit 2eb74ae20e65e71c2d5bf7b8ad7d0ac5d5acf55f
Author: Bryan Wu <cooloney at kernel.org>
Date: Sat May 31 15:17:25 2008 +0800
Blackfin arch: Fix bug - set corret SSEL and IRQ to enable AD7877 on BF527
AD7877 use SSEL_2 (P9.9) and IRQ_PF8 (P9.14) on BF527
- populating JP3 to enable STAMP
- disable SW11.2 to disconnect SSEL_2/PF12 from Rotary NAND
- disable SW18.1 to disconnect SSEL_2 from MAX1233 touchscreen chip
Signed-off-by: Bryan Wu <cooloney at kernel.org>
commit 9c8b28c2ef532c2cf32b59aaa0bc07eb3b866ef7
Author: Timur Tabi <timur at freescale.com>
Date: Sat May 31 08:12:05 2008 +1000
[POWERPC] Fix DMA nodes in the MPC8610 HPCD device tree
The node for DMA2 in the MPC8610 HPCD device tree has the wrong compatible
properties. This breaks the DMA driver and the sound driver.
Signed-off-by: Timur Tabi <timur at freescale.com>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 6907fa26d8934904a4c2594034c1affd8d717cae
Author: Tony Breeds <tony at bakeyournoodle.com>
Date: Wed May 28 10:52:19 2008 +1000
[POWERPC] Export empty_zero_page and copy_page in arch/ppc
Currently ext4 and fuse fail to link if modular:
ERROR: "copy_page" [fs/fuse/fuse.ko] undefined!
ERROR: "empty_zero_page" [fs/ext4/ext4dev.ko] undefined!
make[3]: *** [__modpost] Error 1
make[2]: *** [modules] Error 2
make[1]: *** [sub-make] Error 2
While arch ppc exists it may as well compile, so this exports those
symbols (which are already exported in arch/powerpc).
Signed-off-by: Tony Breeds <tony at bakeyournoodle.com>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit cfab3bdf8292edec19492c89520b1ad11279a648
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Wed May 28 10:18:17 2008 +1000
[POWERPC] Add "memory" clobber to MMIO accessors
Gcc might re-order MMIO accessors vs. surrounding consistent
memory accesses, which is a "bad thing", and could break drivers.
This fixes it by adding a "memory" clobber to the MMIO accessors,
which should prevent gcc from doing that reordering.
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 56997fa838e333cea33ab641d4aeedd23aef0eb1
Author: Grant Grundler <grundler at parisc-linux.org>
Date: Mon May 12 00:37:51 2008 -0600
[netdrvr] tulip: oops in tulip_interrupt when hibernating with swsusp/suspend2
The following patch is seems to fix the tulip suspend/resume panic:
http://bugzilla.kernel.org/show_bug.cgi?id=8952#c46
My attempts at a cleaner patch failed and Pavel thinks this is OK.
Original from: kernelbugs at tap.homeip.net
Signed-off-by: Grant Grundler <grundler at parisc-linux.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit aefdbf1a3b832a580a50cf3d1dcbb717be7cbdbe
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date: Fri May 23 02:00:25 2008 +0400
atl1: fix 4G memory corruption bug
When using 4+ GB RAM and SWIOTLB is active, the driver corrupts
memory by writing an skb after the relevant DMA page has been
unmapped. Although this doesn't happen when *not* using bounce
buffers, clearing the pointer to the DMA page after unmapping
it fixes the problem.
http://marc.info/?t=120861317000005&r=2&w=2
Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
Signed-off-by: Jay Cliburn <jacliburn at bellsouth.net>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 08722bc4a066705e3f5fb4a5a87ce717fe9f896e
Author: Li Yang <leoli at freescale.com>
Date: Fri May 23 18:11:27 2008 +0800
ucc_geth_ethtool: Add a missing HW stats counter
Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund at transmode.se>
Signed-off-by: Li Yang <leoli at freescale.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 25f03dcf63d233c13970751253b62a678bd85ccc
Author: Joakim Tjernlund <Joakim.Tjernlund at transmode.se>
Date: Fri May 23 18:11:26 2008 +0800
ucc_geth_ethtool: Fix typo
Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund at transmode.se>
Signed-off-by: Li Yang <leoli at freescale.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 11a3a1546d0adc36485c2ad4af7ab950712df6ff
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Mon May 26 17:48:13 2008 +1000
virtio: fix delayed xmit of packet and freeing of old packets.
Because we cache the last failed-to-xmit packet, if there are no
packets queued behind that one we may never send it (reproduced here
as TCP stalls, "cured" by an outgoing ping).
Cc: Mark McLoughlin <markmc at redhat.com>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 7eb2e25112bf920bb0a4d1cca445f3d96874c25f
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Mon May 26 17:42:42 2008 +1000
virtio: fix virtio_net xmit of freed skb bug
If we fail to transmit a packet, we assume the queue is full and put
the skb into last_xmit_skb. However, if more space frees up before we
xmit it, we loop, and the result can be transmitting the same skb twice.
Fix is simple: set skb to NULL if we've used it in some way, and check
before sending.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit d399cf8c04c595d738d82d02ae2755b902a51571
Author: Brice Goglin <brice at myri.com>
Date: Wed May 28 09:10:01 2008 +0200
myri10ge: update driver version
Update myri10ge version to 1.3.99-1.347.
Signed-off-by: Brice Goglin <brice at myri.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 6f94f709b5b1d3a9b5f1ff7d4f3534de6cde3ff6
Author: Cesar Eduardo Barros <cesarb at cesarb.net>
Date: Thu May 29 21:58:36 2008 -0300
sc92031: remove bogus unlikely()
Commit 5a0a92e67b5009a71e011658da04fb92dad8961f mentions len < ETH_ZLEN
is true for ARP packets. This obviously is not unlikely.
Signed-off-by: Cesar Eduardo Barros <cesarb at cesarb.net>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 17a9440f7deb781935c76e2e55d376a35611a6f9
Author: Wang Chen <wangchen at cn.fujitsu.com>
Date: Fri May 30 11:18:55 2008 +0800
[netdrvr] CS89X0: Add cleanup for dma after fail
After request_dma() succeeding, any error path should do free_dma().
Signed-off-by: Wang Chen <wangchen at cn.fujitsu.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit b055629eaef7758b35dc91c76cf4f158025562bf
Author: Ben Hutchings <bhutchings at solarflare.com>
Date: Fri May 30 22:18:35 2008 +0100
[netdrvr] sfc: Report XAUI link down at default log level
This is normal when the external link is down so don't report it as an error.
Signed-off-by: Ben Hutchings <bhutchings at solarflare.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 61ac7bf538db2044d0238fcd87b3d9df59294bf2
Merge: 14d03fd98e076c6e60e1085a962410dc4d70ab59 3072c379bccfa2844e33103ed9ff530780e660ea
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri May 30 15:39:05 2008 -0700
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
ahci: change the Device IDs of nvidia MCP7B AHCI controller in ahci.c
[libata] sata_fsl: Fix broken driver, add port multiplier (PMP) support
libata: SRST can't be trusted on PMP sil3726
libata: fix libata-scsi kernel-doc notation
ata: Convert to static DEFINE_SPINLOCK(lock)
ata_piix: fix macbook ich8m problems
sata_mv: implement SoC guideline SATA_S11
sata_mv: workaround for 60x1 errata sata13
sata_mv: nuke unreleased GenIIe revisions
sata_mv: PHY_MODEx errata fixes
sata_mv: move SOC_FLAG to hpriv
commit 0f475b2abed6cbccee1da20a0bef2895eb2a0edd
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Mon May 12 18:31:37 2008 -0700
[PATCH 3/3] ocfs2/net: Silence build warnings
This patch silences the build warnings concerning o2net_init_nst()
and friends when building without CONFIG_DEBUG_FS enabled.
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 959040c37a8cae8117907d4aed87f1b01ff1ea19
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Mon May 12 18:31:36 2008 -0700
[PATCH 2/3] ocfs2/dlm: Silence build warnings
This patch silences the build warnings concerning dlm_debug_init()
and friends when building without CONFIG_DEBUG_FS enabled.
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 271d772d02507c7541d5e6b4938ed2380e59a39a
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Mon May 12 18:31:35 2008 -0700
[PATCH 1/3] ocfs2/net: Silence build warnings
This patch silences the build warnings concerning o2net_debugfs_init()
and friends when building without CONFIG_DEBUG_FS enabled.
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit a12630b186d56a77d17c9b34c82b88dda4337ed7
Author: Joel Becker <joel.becker at oracle.com>
Date: Fri May 9 18:49:29 2008 -0700
ocfs2: Rename 'user_stack' plugin structure to 'ocfs2_user_plugin'
The static structure describing the userspace cluster plugin for ocfs2
was named 'user_stack', which is a real pain when people are grep(1)ing
the tree for the program stack object 'user_stack'. Change the name to
something distinct and namespaced.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 14d03fd98e076c6e60e1085a962410dc4d70ab59
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri May 30 14:02:21 2008 -0700
Mark 'scripts/decodecode' executable
.. because it is.
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 28d7647de2ee075aaed5ca835f445e885884f163
Author: Andrew Vasquez <andrew.vasquez at qlogic.com>
Date: Mon May 19 14:25:41 2008 -0700
[SCSI] qla2xxx: Update version number to 8.02.01-k4.
Signed-off-by: Andrew Vasquez <andrew.vasquez at qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 08b95a12cd956e98b4a1ad5b638935dcb6c88c67
Author: Seokmann Ju <seokmann.ju at qlogic.com>
Date: Mon May 19 14:25:40 2008 -0700
[SCSI] qla2xxx: Correct handling of AENs postings for vports.
Initialize all proper structure members in order to support
work-list vport processing. This code also properly acquires the
correct (physical hardware_lock) lock during work submission.
Signed-off-by: Seokmann Ju <seokmann.ju at qlogic.com>
Signed-off-by: Andrew Vasquez <andrew.vasquez at qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 3c39740073b20d4cbb0e3567225500e96acf383c
Author: Seokmann Ju <seokmann.ju at qlogic.com>
Date: Mon May 19 14:25:39 2008 -0700
[SCSI] qla2xxx: Revert "qla2xxx: Use proper HA during asynchronous event handling."
This reverts commit bd2a1846b2313e32d0270151a31a6b8335384a20.
The original (prior to the reverted commit) code was correct.
Additionally, the vp_idx should be checked during MBA_PORT_UPDATE
in order for proper handling to take place for a given vport.
Signed-off-by: Seokmann Ju <seokmann.ju at qlogic.com>
Signed-off-by: Andrew Vasquez <andrew.vasquez at qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit ab8cd81830fef799177740d5ab709c0341e9ba5c
Merge: f8356ed00ebcdc2f209504c02b4ab8ba9a8a7ebe 20887611523e749d99cc7d64ff6c97d27529fbae
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri May 30 10:20:03 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
lguest: notify on empty
virtio: force callback on empty.
virtio_blk: fix endianess annotations
virtio_config: fix len calculation of config elements
virtio_net: another race with virtio_net and enable_cb
virtio: An entropy device, as suggested by hpa.
virtio_blk: allow read-only disks
lguest: fix ugly <NULL> in /proc/interrupts
virtio: set device index in common code.
virtio: virtio_pci should not set bus_id.
virtio: bus_id for devices should contain 'virtio'
Fix crash in virtio_blk during modprobe ; rmmod ; modprobe
lguest: use ioremap_cache, not ioremap
commit f8356ed00ebcdc2f209504c02b4ab8ba9a8a7ebe
Merge: 7536d7be7b718f8c5834cbcb7601816562e1b805 a9b841e1a336822a25899ec8cdf70a55a6696ae7
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri May 30 10:18:02 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCI: fix rpadlpar pci hotplug driver sysfs usage
commit 7536d7be7b718f8c5834cbcb7601816562e1b805
Merge: 57f50ca127a3189566af0d6378394c75a26f0f7e 5adad0133907790c50283bf03271d920d6897043
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri May 30 10:17:19 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: rename SW_RADIO to SW_RFKILL_ALL
Input: gtco - fix double kfree in error handling path
Input: pxa27x_keypad - miscellaneous fixes
Input: atkbd - mark keyboard as disabled when suspending/unloading
Input: apanel - remove duplicate include
Input: wm9713 - support five wire panels
Input: wm97xx-core - fix race on PHY init
Input: wm97xx-core - fix driver name
Input: wm97xx-core - report a phys for WM97xx touchscreens
Input: i8042 - make sure Dritek quirk is invoked at resume
Input: i8042 - add Dritek quirk for Acer TravelMate 660
commit 57f50ca127a3189566af0d6378394c75a26f0f7e
Author: Ingo Molnar <mingo at elte.hu>
Date: Fri May 30 17:02:50 2008 +0200
drivers/watchdog/geodewdt.c: build fix
* Wim Van Sebroeck <wim at iguana.be> wrote:
> Author: Jordan Crouse <jordan.crouse at amd.com>
> Date: Mon Jan 21 10:07:00 2008 -0700
>
> [WATCHDOG] Add a watchdog driver based on the CS5535/CS5536 MFGPT timers
-tip testing found the following build failure on latest -git:
drivers/watchdog/geodewdt.c: In function 'geodewdt_probe':
drivers/watchdog/geodewdt.c:225: error: too many arguments to function 'geode_mfgpt_alloc_timer'
make[1]: *** [drivers/watchdog/geodewdt.o] Error 1
make: *** [drivers/watchdog/geodewdt.o] Error 2
with this config:
http://redhat.com/~mingo/misc/config-Fri_May_30_15_19_52_CEST_2008.bad
find the fix below.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Acked-by: Jordan Crouse <jordan.crouse at amd.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a9b841e1a336822a25899ec8cdf70a55a6696ae7
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Fri May 30 13:39:12 2008 +1000
PCI: fix rpadlpar pci hotplug driver sysfs usage
When Greg "fixed" the sysfs usage of that driver a while back, he seem
to have introduced a bug where the quotes are added around the name of
our specific sysfs files, thus breaking the user space tool.
This fixes it. Tested DLPAR operations on a POWER6 machine successfully.
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit 3072c379bccfa2844e33103ed9ff530780e660ea
Author: peerchen <peerchen at gmail.com>
Date: Mon May 19 14:44:57 2008 +0800
ahci: change the Device IDs of nvidia MCP7B AHCI controller in ahci.c
Change the partial Device IDs of nvidia MCP7B AHCI controller in ahci.c,
as the actual PCI IDs deployed in the field differed from the forecasted ones
preemptively placed in the driver.
Signed-off-by: Peer Chen <peerchen at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 034d8e8f273fcb02bebd6a62d8023ffa409fe92f
Author: Ashish Kalra <ashish.kalra at freescale.com>
Date: Tue May 20 00:19:45 2008 -0500
[libata] sata_fsl: Fix broken driver, add port multiplier (PMP) support
The following commit (4c9bf4e799ce06a7378f1196587084802a414c03):
libata: replace tf_read with qc_fill_rtf for non-SFF drivers
Broke the sata_fsl.c driver in 2.6.26-rc. I know the following patch fixes
the issue, it clearly also adds port multipler support. The current
2.6.26-rc driver is broken.
On boot with debug enabled we get something like (w/o this patch):
spurious interrupt!!, CC = 0x1
interrupt status 0x1
xx_scr_read, reg_in = 1
spurious interrupt!!, CC = 0x1
interrupt status 0x1
xx_scr_read, reg_in = 1
spurious interrupt!!, CC = 0x1
interrupt status 0x1
xx_scr_read, reg_in = 1
.. continues for ever.
This change fixes this as a side effect of adding port multiplier support.
Signed-off-by: Ashish Kalra <ashish.kalra at freescale.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 19ef9d5e45ce805700f34c248a71a511877b8a5d
Author: Tejun Heo <htejun at gmail.com>
Date: Wed May 21 14:11:24 2008 +0900
libata: SRST can't be trusted on PMP sil3726
As in sil4726, SRST can't be trusted on sil3726 causing detection
problems under certain configuraitons. I thought it was from the
Config Disk device but apparently not.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit ec2a20e61974f7c9ebe6dd99ac479ec309a750bc
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Wed Apr 30 12:57:00 2008 -0700
libata: fix libata-scsi kernel-doc notation
Fix libata-scsi kernel-doc notation:
Warning(linux-2.6.25-git15//drivers/ata/libata-scsi.c:1659): No description found for parameter 'cmd'
Warning(linux-2.6.25-git15//drivers/ata/libata-scsi.c:1971): No description found for parameter 'buf'
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 2da676594a73825f10d2a99358cc7465119684f9
Author: Pradeep Singh Rautela <rautelap at gmail.com>
Date: Thu May 29 23:28:14 2008 +0530
ata: Convert to static DEFINE_SPINLOCK(lock)
Replace deprecated static spinlock_t instance to static DEFINE_SPINLOCK(lock).
Signed-off-by: Pradeep Singh <rautelap at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 23cf296e3b047da46112eb6b4dc89917c93c8f19
Author: Tejun Heo <htejun at gmail.com>
Date: Thu May 29 22:04:22 2008 +0900
ata_piix: fix macbook ich8m problems
ICH8M on macbooks are peculiar in that some of them lock up when the
second port is enabled, some return bogus values on SIDPR access while
yet others hang on SIDPR access. Also, the ich8m_apple_sata entry was
wrongly added below generic ich8m entry making it virtually useless.
This patch works around macbook ich8m problems by
* moving ich8m_apple_sata entry above generic ich8m entry
* dropping PIIX_FLAG_SIDPR from ich8m_apple_sata
* adding subsystem 106b:00a1 as ich8m_apple_sata
Reported and tested by MATSUBAYASHI.
Signed-off-by: Tejun Heo <htejun at gmail.com>
Cc: MATSUBAYASHI 'Shaolin' Kohji <shaolin at rhythmaning.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 0388a8c0d54aa039758a8eca68d82325a563f8db
Author: Mark Lord <liml at rtr.ca>
Date: Wed May 28 13:41:52 2008 -0400
sata_mv: implement SoC guideline SATA_S11
The 5182 System-On-Chip (SOC) variant wants certain lower
bits to be cleared on any write to the PHY_MODE3 register.
If/when support is added for other SOC variants, we'll need
some way to uniquely identify the 5182, and not perform this
workaround for the others.
But for now, it is the only SOC variant we support here.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit b406c7a6655da7a2fcd9f72e41262f93ff707748
Author: Mark Lord <liml at rtr.ca>
Date: Wed May 28 12:01:12 2008 -0400
sata_mv: workaround for 60x1 errata sata13
The "B2" variant of the 6041/6081 (genII) chips requires
that the PHY_MODE3 register be rewritten after any write
to PHY_MODE4.
This fixes a regression introduced by an earlier patch.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 5cf73bfb061552aa18d816d2859409be9ace5306
Author: Mark Lord <liml at rtr.ca>
Date: Tue May 27 17:58:56 2008 -0400
sata_mv: nuke unreleased GenIIe revisions
The only public release of the 6042/7042 chips was/is revision "B0".
Remove code that attempted to deal with earlier, non-released revs.
This matches the logic of the current Marvell "proprietary" driver.
Also, bump up the sata_mv version number, to reflect this batch of erratas.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 8c30a8b9b574cf6c51e207464b852a6f559da153
Author: Mark Lord <liml at rtr.ca>
Date: Tue May 27 17:56:31 2008 -0400
sata_mv: PHY_MODEx errata fixes
Fix and update the errata handling for the PHY_MODEx registers.
This improves receiver noise tolerance, among other things.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 1f39847255a02c69190ae30c33b8ccf4c10840df
Author: Mark Lord <liml at rtr.ca>
Date: Tue May 27 17:54:48 2008 -0400
sata_mv: move SOC_FLAG to hpriv
Convert the System-on-Chip flag from a host flag to an hpriv flag,
for better consistency with other chip-rev flags, and for easier use
in errata fixes etc.
Also change the related "HAS_PCI()" into "!IS_SOC()" for better consistency
of naming/use (everything else SOC-related already uses "SOC").
There are no functionality changes in this patch.
Signed-off-by: Mark Lord <mlord at pobox.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 79d06432a27601f096e08716fee3f0a7d3b68d5f
Author: Takashi Iwai <tiwai at suse.de>
Date: Fri May 30 16:54:49 2008 +0200
[ALSA] hda - Fix model for LG LS75 laptop
Set the proper model for LG LS75 with CM9880 codec.
See ALSA bug#2105:
https://bugtrack.alsa-project.org/alsa-bug/view.php?id=2105
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 1beee8dc8cf58e3f605bd7b34d7a39939be7d8d2
Merge: 9db8ee3d96e98705ba4e9260815ca326b0d07741 3446b9d57edd0b96a89715fef222879e4919a115
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri May 30 07:45:20 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (26 commits)
llc: Fix double accounting of received packets
netfilter: nf_conntrack_expect: fix error path unwind in nf_conntrack_expect_init()
bluetooth: fix locking bug in the rfcomm socket cleanup handling
mac80211: fix alignment issue with compare_ether_addr()
mac80211: Fix for NULL pointer dereference in sta_info_get()
mac80211: fix a typo in ieee80211_handle_filtered_frame comment
rndis_wlan: add missing range check for power_output modparam
iwlwifi: fix rate scale TLC column selection bug
iwlwifi: fix exit from stay_in_table state
rndis_wlan: Make connections to TKIP PSK networks work
mac80211 : Fixes the status message for iwconfig
rt2x00: Use atomic interface iteration in irq context
rt2x00: Reset antenna RSSI after switch
rt2x00: Don't count retries as failure
rt2x00: Fix memleak in tx() path
mac80211: reorder channel and freq reporting in wext scan report
b43: Fix controller restart crash
mac80211: fix ieee80211_rx_bss_put/get imbalance
net/mac80211: always true conditionals
b43: Upload both beacon templates on initial load
...
commit 9db8ee3d96e98705ba4e9260815ca326b0d07741
Merge: e3aa51fecdc941c859ed0515084323d3f997aa4a 0066ed55a9a061ed64bbc09c16f45daf0b976ac5
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri May 30 07:44:19 2008 -0700
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] Update default configuration.
[S390] disassembler: fix idte instruction format.
[S390] tape: fix race with stack local wait_queue_head_t.
[S390] 3270: fix race with stack local wait_queue_head_t.
[S390] dasd: use a generic wait_queue for sleep_on
[S390] sclp_vt220: fix scheduling while atomic bug.
[S390] showmem: Only walk spanned pages.
[S390] appldata: prevent cpu hotplug when walking cpu_online_map.
[S390] Fix section mismatch warnings.
[S390] s390 types: make dma_addr_t 64 bit capable
[S390] tape: Fix race condition in tape block device driver
[S390] fix sparsemem related compile error with allnoconfig on s390
commit e3aa51fecdc941c859ed0515084323d3f997aa4a
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu May 29 17:51:57 2008 -0700
acpi: fix sparse const errors
In this case we want a constant pointer to constant chars:
drivers/misc/thinkpad_acpi.c:3824:19: error: Just how const do you want this type to be?
Like the error says.
drivers/misc/thinkpad_acpi.c:3863:19: error: Just how const do you want this type to be?
drivers/misc/thinkpad_acpi.c:3864:19: error: Just how const do you want this type to be?
drivers/misc/thinkpad_acpi.c:3865:19: error: Just how const do you want this type to be?
drivers/misc/thinkpad_acpi.c:3866:19: error: Just how const do you want this type to be?
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Acked-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5adad0133907790c50283bf03271d920d6897043
Author: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Date: Fri May 30 10:40:46 2008 -0400
Input: rename SW_RADIO to SW_RFKILL_ALL
The SW_RADIO code for EV_SW events has a name that is not descriptive
enough of its intended function, and could induce someone to think
KEY_RADIO is its EV_KEY counterpart, which is false.
Rename it to SW_RFKILL_ALL, and document what this event is for. Keep
the old name around, to avoid userspace ABI breaks.
The SW_RFKILL_ALL event is meant to be used by rfkill master switches. It
is not bound to a particular radio switch type, and usually applies to all
types. It is semantically tied to master rfkill switches that enable or
disable every radio in a system.
Signed-off-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit 501a5250589be41c4c060afa855bc60b4539a340
Author: Dmitry Torokhov <dmitry.torokhov at gmail.com>
Date: Fri May 30 10:40:28 2008 -0400
Input: gtco - fix double kfree in error handling path
The code would try to free 'report' twice upon input_register_device()
failure.
Reported-by: Julia Lawall <julia at diku.dk>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit 269ef19caa16650bf3a68fd33a6cb800683419dd
Author: Takashi Iwai <tiwai at suse.de>
Date: Fri May 30 15:32:15 2008 +0200
[ALSA] hda - Fix mic input on HP2133
The mic pins are wrongly assigned on AD1884A mobile model.
The mic handling is fixed for the automatic mic selection, too.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit e48d6d97bb6bd8c008045ea0522ea8278fdccc55
Author: Takashi Iwai <tiwai at suse.de>
Date: Thu May 29 08:16:56 2008 +0200
[ALSA] ac97 - Fix ASUS A9T laptop output
ASUS A9T laptop uses line-out pin as the real front-output while
other devices use it as the surround.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 3446b9d57edd0b96a89715fef222879e4919a115
Author: Arnaldo Carvalho de Melo <acme at redhat.com>
Date: Fri May 30 02:57:29 2008 -0700
llc: Fix double accounting of received packets
llc_sap_rcv was being preceded by skb_set_owner_r, then calling
llc_state_process that calls sock_queue_rcv_skb, that in turn calls
skb_set_owner_r again making the space allowed to be used by the socket to be
leaked, making the socket to get stuck.
Fix it by setting skb->sk at llc_sap_rcv and leave the accounting to be done
only at sock_queue_rcv_skb.
Reported-by: Dmitry Petukhov <dmgenp at gmail.com>
Tested-by: Dmitry Petukhov <dmgenp at gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit fbaa20f66a8283359523dfe961ebe66f0b8fac59
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Fri May 30 02:01:28 2008 -0700
sparc64: IO accessors fix
From: Benjamin Herrenschmidt <benh at kernel.crashing.org>
I added a full memory clobber on all asm accessors except the _raw
ones.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 0066ed55a9a061ed64bbc09c16f45daf0b976ac5
Author: Martin Schwidefsky <schwidefsky at de.ibm.com>
Date: Fri May 30 10:03:35 2008 +0200
[S390] Update default configuration.
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 209fb9090f4ca5874289c9ca82991393f85c1eff
Author: Martin Schwidefsky <schwidefsky at de.ibm.com>
Date: Fri May 30 10:03:34 2008 +0200
[S390] disassembler: fix idte instruction format.
The correct instruction format of idte is "idte r1,r3,r2" with
r1 at bit 24, r3 at bit 16 and r2 at bit 28.
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 4657fb8a98a4e02981a574492bbe470c147b6657
Author: Martin Schwidefsky <schwidefsky at de.ibm.com>
Date: Fri May 30 10:03:33 2008 +0200
[S390] tape: fix race with stack local wait_queue_head_t.
A wait_event call with a stack local wait_queue_head_t structure that is
used to do the wake up for the wait_event is inherently racy. After the
wait_event finished the wake_up call might not have completed yet.
Replace the stack local wait_queue_head_t in tape_do_io and
tape_do_io_interruptible with a per device wait queue.
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 54ad64129cc166b9eec7151f3f9fc83589e33555
Author: Martin Schwidefsky <schwidefsky at de.ibm.com>
Date: Fri May 30 10:03:32 2008 +0200
[S390] 3270: fix race with stack local wait_queue_head_t.
A wait_event call with a stack local wait_queue_head_t structure that is
used to do the wake up for the wait_event is inherently racy. After the
wait_event finished the wake_up call might not have completed yet.
Remove the stack local wait_queue_head_t from raw3270_start_init and
use the global raw3270_wait_queue instead.
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit c80ee724966a8ce9a68020d9095233fb1c6f57e8
Author: Stefan Haberland <stefan.haberland at de.ibm.com>
Date: Fri May 30 10:03:31 2008 +0200
[S390] dasd: use a generic wait_queue for sleep_on
Use a generic wait_queue to prevent the wait_queue in dasd_sleep_on_
functions from being referenced by callback_data while it does not
exist any more.
Signed-off-by: Stefan Haberland <stefan.haberland at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit d4820e44b0ae6830b1d634e6d0a425d839388c06
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Fri May 30 10:03:30 2008 +0200
[S390] sclp_vt220: fix scheduling while atomic bug.
The driver incorrectly assumed that putchar will only be called from
schedulable process context and therefore blocked and waited if no
free output buffers where available.
Since putchar may also be called from BH context this may lead to
deadlocks.
To fix this just return the number of characters accepted and let the
upper layer handle the rest.
The console write function will busy wait (sclp_sync_wait) until a
buffer is available again.
Cc: Peter Oberparleiter <peter.oberparleiter at de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit c1bb7f31eaef6ed6b9f895b99d9ea12e6b853606
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Fri May 30 10:03:29 2008 +0200
[S390] showmem: Only walk spanned pages.
Convert show_mem() so its nearly the same as on x86/powerpc.
Gives us proper locking and we get also rid of the only use of max_mapnr.
Also the number of pages was contained in an int which might not be
sufficient not too far in the future.
Cc: Johannes Weiner <hannes at saeurebad.de>
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 1760537b69123905bf4f4b56f5746ae4547e9694
Author: Gerald Schaefer <gerald.schaefer at de.ibm.com>
Date: Fri May 30 10:03:28 2008 +0200
[S390] appldata: prevent cpu hotplug when walking cpu_online_map.
Use get_online_cpus() to prevent cpu hotplug in situations where
for_each_online_cpu() is called.
Signed-off-by: Gerald Schaefer <gerald.schaefer at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 67060d9c1f5d91c917cc51bed464cb5638eaddbc
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Fri May 30 10:03:27 2008 +0200
[S390] Fix section mismatch warnings.
This fixes the last remaining section mismatch warnings in s390
architecture code. It reveals also a real bug introduced by... me
with git commit 2069e978d5a6e7b45d58027e3de7f879b8c5e488
("[S390] sparsemem vmemmap: initialize memmap.")
Calling the generic vmemmap_alloc_block() function to get initialized
memory is a nice idea, however that function is __meminit annotated
and therefore the function might be gone if we try to call it later.
This can happen if a DCSS segment gets added.
So basically revert the patch and clear the memmap explicitly to fix
the original bug.
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit bebd9a455b2593ba6543b961bc82c43350c2d8d9
Author: Christian Borntraeger <borntraeger at de.ibm.com>
Date: Fri May 30 10:03:26 2008 +0200
[S390] s390 types: make dma_addr_t 64 bit capable
virtio tests with guests larger than 4 GB revealed that the dma_addr_t
definition for s390 did not make it into the 64bit world.
This patch changes the definition on s390 to have an u64 on 64bit and
u32 on 32bit systems.
Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit f71ad62a264a89cb1952df0c92b167005de8d1b0
Author: Michael Holzheu <holzheu at de.ibm.com>
Date: Fri May 30 10:03:25 2008 +0200
[S390] tape: Fix race condition in tape block device driver
Due to incorrect function call sequence it can happen that a tape block
request is finished before the request is taken from the block request queue.
The following sequence leads to that condition:
* tapeblock_start_request() -> start CCW program
* Request finishes -> IO interrupt
* tapeblock_end_request()
* end_that_request_last()
If blkdev_dequeue_request() has not been called before end_that_request_last(),
a kernel bug is triggered in end_that_request_last() because the request is
still queued. To solve that problem blkdev_dequeue_request() has to be called
before starting the CCW program.
Signed-off-by: Michael Holzheu <holzheu at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 97195d6b411fec8e33aa55b6a7c3dde7984d65ca
Author: Hans-Joachim Picht <hans at linux.vnet.ibm.com>
Date: Fri May 30 10:03:24 2008 +0200
[S390] fix sparsemem related compile error with allnoconfig on s390
On s390 make allnoconfig fails with the following build error:
arch/s390/mm/init.c: In function 'show_mem':
arch/s390/mm/init.c:55: error: implicit declaration of function 'pfn_valid'
make[1]: *** [arch/s390/mm/init.o] Error 1
make: *** [arch/s390/mm] Error 2
This problem can by fixed ensuring that ARCH_SELECT_MEMORY_MODEL
is always turned on.
Signed-off-by: Hans-Joachim Picht <hans at linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 20887611523e749d99cc7d64ff6c97d27529fbae
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Fri May 30 15:09:46 2008 -0500
lguest: notify on empty
This is the lguest implementation of the VIRTIO_F_NOTIFY_ON_EMPTY feature.
It is currently only published for network devices, but it is turned on for
everyone.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit b4f68be6c5d507afdcd74f5be3df0b1209cda503
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Fri May 30 15:09:45 2008 -0500
virtio: force callback on empty.
virtio allows drivers to suppress callbacks (ie. interrupts) for
efficiency (no locking, it's just an optimization).
There's a similar mechanism for the host to suppress notifications
coming from the guest: in that case, we ignore the suppression if the
ring is completely full.
It turns out that life is simpler if the host similarly ignores
callback suppression when the ring is completely empty: the network
driver wants to free up old packets in a timely manner, and otherwise
has to use a timer to poll.
We have to remove the code which ignores interrupts when the driver
has disabled them (again, it had no locking and hence was unreliable
anyway).
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit 7757f09c70af87887dfc195e6d6ddd54f5cc7c39
Author: Christian Borntraeger <borntraeger at de.ibm.com>
Date: Thu May 29 11:10:01 2008 +0200
virtio_blk: fix endianess annotations
Since commit 72e61eb40b55dd57031ec5971e810649f82b0259 (virtio: change config
to guest endian) config space is no longer fixed endian.
Lets change the virtio_blk_config variables.
Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit 7f31fe05000af54e1af81f65a96cab90db8d7ed8
Author: Christian Borntraeger <borntraeger at de.ibm.com>
Date: Thu May 29 11:08:01 2008 +0200
virtio_config: fix len calculation of config elements
Rusty,
This patch is a prereq for the virtio_blk blocksize patch, please apply it
first.
Adding an u32 value to the virtio_blk_config unconvered a small bug the config
space defintions:
v is a pointer, to we have to use sizeof(*v) instead of sizeof(v).
Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit 52a3a05f3ab82655ffa4c9bf6835565c98a3c2e5
Author: Christian Borntraeger <borntraeger at de.ibm.com>
Date: Mon May 26 11:29:27 2008 +0200
virtio_net: another race with virtio_net and enable_cb
Hello Rusty,
seems that we still have a problem with virtio_net and the enable_cb callback.
During a long running network stress tests with virtio and got the following
oops:
------------[ cut here ]------------
kernel BUG at drivers/virtio/virtio_ring.c:230!
illegal operation: 0001 [#1] SMP
Modules linked in:
CPU: 0 Not tainted 2.6.26-rc2-kvm-00436-gc94c08b-dirty #34
Process netserver (pid: 2582, task: 000000000fbc4c68, ksp: 000000000f42b990)
Krnl PSW : 0704c00180000000 00000000002d0ec8 (vring_enable_cb+0x1c/0x60)
R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:3 CC:0 PM:0 EA:3
Krnl GPRS: 0000000000000000 0000000000000000 000000000ef3d000 0000000010009800
0000000000000000 0000000000419ce0 0000000000000080 000000000000007b
000000000adb5538 000000000ef40900 000000000ef40000 000000000ef40920
0000000000000000 0000000000000005 000000000029c1b0 000000000fea7d18
Krnl Code: 00000000002d0ebc: a7110001 tmll %r1,1
00000000002d0ec0: a7740004 brc 7,2d0ec8
00000000002d0ec4: a7f40001 brc 15,2d0ec6
>00000000002d0ec8: a517fffe nill %r1,65534
00000000002d0ecc: 40103000 sth %r1,0(%r3)
00000000002d0ed0: 07f0 bcr 15,%r0
00000000002d0ed2: e31020380004 lg %r1,56(%r2)
00000000002d0ed8: a7480000 lhi %r4,0
Call Trace:
([<000000000029c0fc>] virtnet_poll+0x290/0x3b8)
[<0000000000333fb8>] net_rx_action+0x9c/0x1b8
[<00000000001394bc>] __do_softirq+0x74/0x108
[<000000000010d16a>] do_softirq+0x92/0xac
[<0000000000139826>] irq_exit+0x72/0xc8
[<000000000010a7b6>] do_extint+0xe2/0x104
[<0000000000110508>] ext_no_vtime+0x16/0x1a
Last Breaking-Event-Address:
[<00000000002d0ec4>] vring_enable_cb+0x18/0x60
I looked into the virtio_net code for some time and I think the following
scenario happened. Please look at virtnet_poll:
[...]
/* Out of packets? */
if (received < budget) {
netif_rx_complete(vi->dev, napi);
if (unlikely(!vi->rvq->vq_ops->enable_cb(vi->rvq))
&& napi_schedule_prep(napi)) {
vi->rvq->vq_ops->disable_cb(vi->rvq);
__netif_rx_schedule(vi->dev, napi);
goto again;
}
}
If an interrupt arrives after netif_rx_complete, a second poll routine can run
on a different cpu. The second check for napi_schedule_prep would prevent any
harm in the network stack, but we have called enable_cb possibly after the
disable_cb in skb_recv_done.
static void skb_recv_done(struct virtqueue *rvq)
{
struct virtnet_info *vi = rvq->vdev->priv;
/* Schedule NAPI, Suppress further interrupts if successful. */
if (netif_rx_schedule_prep(vi->dev, &vi->napi)) {
rvq->vq_ops->disable_cb(rvq);
__netif_rx_schedule(vi->dev, &vi->napi);
}
}
That means that the second poll routine runs with interrupts enabled, which is
ok, since we can handle additional interrupts. The problem is now that the
second poll routine might also call enable_cb, triggering the BUG.
The only solution I can come up with, is to remove the BUG statement in
enable_cb - similar to disable_cb. Opinions or better ideas where the oops
could come from?
Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit f7f510ec195781c857ab76366a3e1c59e1caae42
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Fri May 30 15:09:44 2008 -0500
virtio: An entropy device, as suggested by hpa.
Note that by itself, having a "hardware" random generator does very
little: you should probably run "rngd" in your guest to feed this into
the kernel entropy pool.
Included:
virtio_rng: dont use vmalloced addresses for virtio
If virtio_rng is build as a module, random_data is an address
in vmalloc space. As virtio expects guest real addresses, this
can cause any kind of funny behaviour, so lets allocate
random_data dynamically with kmalloc.
Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit 3ef536095446552823fc488fec1c5451aab1260d
Author: Christian Borntraeger <borntraeger at de.ibm.com>
Date: Fri May 16 11:17:03 2008 +0200
virtio_blk: allow read-only disks
Hello Rusty,
sometimes it is useful to share a disk (e.g. usr). To avoid file system
corruption, the disk should be mounted read-only in that case. This patch
adds a new feature flag, that allows the host to specify, if the disk should
be considered read-only.
Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit a16ffe93c46dfca211434d00453ebb695025978b
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Fri May 30 15:09:42 2008 -0500
lguest: fix ugly <NULL> in /proc/interrupts
Before:
root at ubuntu:~# cat /proc/interrupts
CPU0
1: 1672 lguest-<NULL> virtio0
2: 1 lguest-<NULL> virtio1
...
After:
root at ubuntu:~# cat /proc/interrupts
CPU0
1: 2889 lguest-level virtio0
2: 9 lguest-level virtio1
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit b769f579081943f14e0ff03b7b0bd3a11cf14625
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Fri May 30 15:09:42 2008 -0500
virtio: set device index in common code.
Anthony Liguori points out that three different transports use the virtio code,
but each one keeps its own counter to set the virtio_device's index field. In
theory (though not in current practice) this means that names could be
duplicated, and that risk grows as more transports are created.
So we move the selection of the unique virtio_device.index into the common code
in virtio.c, which has the side-benefit of removing duplicate code.
The only complexity is that lguest and S/390 use the index to uniquely identify
the device in case of catastrophic failure before register_virtio_device() is
called: now we use the offset within the descriptor page as a unique identifier
for the printks.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
Cc: Christian Borntraeger <borntraeger at de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
Cc: Carsten Otte <cotte at de.ibm.com>
Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
Cc: Chris Lalancette <clalance at redhat.com>
Cc: Anthony Liguori <anthony at codemonkey.ws>
commit 5610bd1524332fe7d651eb56cc780e32763a2ac3
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Fri May 30 15:09:42 2008 -0500
virtio: virtio_pci should not set bus_id.
The common virtio code sets the bus_id, overriding anything virtio_pci
sets anyway.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
Cc: Christian Borntraeger <borntraeger at de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
Cc: Carsten Otte <cotte at de.ibm.com>
Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
Cc: Chris Lalancette <clalance at redhat.com>
Cc: Anthony Liguori <anthony at codemonkey.ws>
commit 2ad3cfbac58d0a6c6e65aafd9e0e757ca3d35292
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Fri May 30 15:09:41 2008 -0500
virtio: bus_id for devices should contain 'virtio'
Chris Lalancette <clalance at redhat.com> points out that virtio.c sets all device
names to '0', '1', etc, which looks silly in /proc/interrupts. We change this
from '%d' to 'virtio%d'.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
Cc: Christian Borntraeger <borntraeger at de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
Cc: Carsten Otte <cotte at de.ibm.com>
Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
Cc: Chris Lalancette <clalance at redhat.com>
Cc: Anthony Liguori <anthony at codemonkey.ws>
commit ac9d463afb1ca2434335351f3b7d9e4c8f8470e9
Author: Chris Lalancette <clalance at redhat.com>
Date: Fri May 30 15:09:41 2008 -0500
Fix crash in virtio_blk during modprobe ; rmmod ; modprobe
Fix a modprobe virtio_blk ; rmmod virtio_blk ; modprobe virtio_blk crash; this
was basically because we weren't doing "del_gendisk()" in the remove path.
Signed-off-by: Chris Lalancette <clalance at redhat.com>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au> (moved del_gendisk up)
commit e27810f11340987df123a99eb9ae14c054a55639
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Fri May 30 15:09:40 2008 -0500
lguest: use ioremap_cache, not ioremap
Thanks to Jon Corbet & LWN. Only took me a day to join the dots.
Host->Guest netcat before (with unnecessily large receive buffers):
1073741824 bytes (1.1 GB) copied, 24.7528 seconds, 43.4 MB/s
After:
1073741824 bytes (1.1 GB) copied, 17.6369 seconds, 60.9 MB/s
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit 916941b2bfd9c4a8b66855f198ae16c3f51ef570
Merge: fbf4d7ffda0398e8b20aa8b34ca751bf946699ef 413c239fad68258157f903b3ffd9bfcc53f5e34b
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu May 29 21:29:39 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
driver-core: prepare for 2.6.27 api change by adding dev_set_name
commit fbf4d7ffda0398e8b20aa8b34ca751bf946699ef
Merge: 4bd27972e2c35b1e9e672ff05e0a781644f9c905 bb7e6984ecaebe6989d0e781e303469255871432
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu May 29 21:27:53 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
Revert "USB: EHCI: fix performance regression"
USB: fsl_usb2_udc: fix recursive lock
USB: usb-serial: option: Don't match Huawei driver CD images
USB: pl2303: another product ID
USB: add another scanner quirk
USB: Add support for ROKR W5 in unusual_devs.h
USB: Fix M600i unusual_devs entry
USB: usb-storage: unusual_devs update for Cypress ATACB
USB: EHCI: fix performance regression
USB: EHCI: fix bug in Iso scheduling
USB: EHCI: fix remote-wakeup regression
USB: EHCI: suppress unwanted error messages
USB: EHCI: fix up root-hub TT mess
USB: add all configs to the "descriptors" attribute
USB: fix possible deadlock involving sysfs attributes
USB: Firmware loader driver for USB Apple iSight camera
USB: FTDI_SIO : Add support for Matrix Orbital PID Range
commit 413c239fad68258157f903b3ffd9bfcc53f5e34b
Author: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Fri May 30 10:16:40 2008 +1000
driver-core: prepare for 2.6.27 api change by adding dev_set_name
Create the dev_set_name function now so that various subsystems can
start changing over to it before other changes in 2.6.27 will make it
compulsory.
Cc: Kay Sievers <kay.sievers at vrfy.org>
Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit bb7e6984ecaebe6989d0e781e303469255871432
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date: Thu May 29 19:43:27 2008 -0700
Revert "USB: EHCI: fix performance regression"
This reverts commit fa38dfcc56b5f6cce787f9aaa5d1830509213802.
It wasn't really a regression and David and Alan are still working
through the issues reported.
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 185e3dead35dacb79c8cca1073fd67a26d09a0d7
Author: Li Yang <leoli at freescale.com>
Date: Thu May 29 21:04:45 2008 +0800
USB: fsl_usb2_udc: fix recursive lock
UDC needs to release lock before calling out to gadget driver, since
it may need to reenter. The change fixes kernel BUG observed on rt
kernel.
> kernel BUG at kernel/rtmutex.c:683!
> stopped custom tracer.
> Oops: Exception in kernel mode, sig: 5 [#1]
> PREEMPT MPC834x ITX
> NIP: c021629c LR: c0216270 CTR: 00000000
> REGS: df761d70 TRAP: 0700 Not tainted (2.6.23.9-rt13)
> MSR: 00021032 <ME,IR,DR> CR: 28000022 XER: 00000000
> TASK = df632080[241] 'IRQ-38' THREAD: df760000
> GPR00: 00000001 df761e20 df632080 00000000 11111111 00000000 df761e6c
> 00000000
> GPR08: df761e48 00000000 df761e50 00000000 80000000 ede5cdde 1fffd000
> 00800000
> GPR16: ffffffff 00000000 007fff00 00000040 00000000 007ffeb0 00000000
> 1fff8b08
> GPR24: 00000000 00000026 00000000 df79a320 c026b2e8 c02240bc 00009032
> df79a320
> NIP [c021629c] rt_spin_lock_slowlock+0x9c/0x200
> LR [c0216270] rt_spin_lock_slowlock+0x70/0x200
> Call Trace:
> [df761e20] [c0216270] rt_spin_lock_slowlock+0x70/0x200 (unreliable)
> [df761e90] [c0182828] fsl_ep_disable+0xcc/0x154
> [df761eb0] [c0184d30] eth_reset_config+0x88/0x1d0
> [df761ed0] [c0184ec0] eth_disconnect+0x48/0x64
> [df761ef0] [c01831a4] reset_queues+0x60/0x78
> [df761f00] [c0183b74] fsl_udc_irq+0x9b8/0xa58
> [df761f50] [c003ef30] handle_IRQ_event+0x64/0x100
> [df761f80] [c003f758] thread_simple_irq+0x6c/0xc8
> [df761fa0] [c003f888] do_irqd+0xd4/0x2e4
> [df761fd0] [c0032284] kthread+0x50/0x8c
> [df761ff0] [c000f9b4] kernel_thread+0x44/0x60
Signed-off-by: Li Yang <leoli at freescale.com>
Cc: Eugene T. Bordenkircher <Eugene_Bordenkircher at selinc.com>
Acked-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit a7f3872c43b8001f01000f79583d422c6995f98d
Author: Michael Karcher <kernel at mkarcher.dialup.fu-berlin.de>
Date: Wed May 28 23:58:18 2008 +0200
USB: usb-serial: option: Don't match Huawei driver CD images
Add the interface info matching to all Huawei cards, as they all also
contain a Mass Storage Device interface (usually containing Windows
drivers) which should not get bound by this driver.
See also drivers/usb/storage/unusual_devs.h
Signed-off-by: Michael Karcher <kernel at mkarcher.dialup.fu-berlin.de>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 4be2fa186d54758296d30c565d7b5111dd45b000
Author: Steve Murphy <steve at gnusis.org>
Date: Fri May 23 23:39:05 2008 +0530
USB: pl2303: another product ID
I've just got a USB GPRS/EDGE modem branded Manufacturer Micromax Model
MMX610U (see http://www.airtel.in/level2_t3data.aspx?path=1/106/179)
working by adding another product ID to pl2303. Modem info reports same
module as Max Arnold's i.e.SIMCOM SIM600 but with product ID 0x0612
(cf Ox0611).
From: Steve Murphy <steve at gnusis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 598eff6d2f3b8805232edc5f4a6b0c1e698dc482
Author: René Rebe <rene at exactcode.de>
Date: Tue May 27 09:05:46 2008 +0200
USB: add another scanner quirk
Like the HP53{00,70} scanner other devices of the OEM Avision require
the USB_QUIRK_STRING_FETCH_255 to correct set a configuration with
"recent" Linux kernels.
Signed-off-by: René Rebe <rene at exactcode.de>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 2a8bc9e7cfb1761a62ea897b407ea13ec887fd0c
Author: Javier Smaldone <javier at smaldone.com.ar>
Date: Mon May 26 21:44:00 2008 +0200
USB: Add support for ROKR W5 in unusual_devs.h
This patch adds support for rev 2 of an existing unusual_devs entry
enabling ROKR W5s to work. Greg, please apply.
From: Javier Smaldone <javier at smaldone.com.ar>
Signed-off-by: Phil Dibowitz <phil at ipom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit c5f23b0e08d84f4efc20dece04d7b6796dcc6774
Author: Phil Dibowitz <phil at ipom.com>
Date: Mon May 26 21:33:58 2008 +0200
USB: Fix M600i unusual_devs entry
It turns out that the unusual_devs entry for the Motorola M600i needs
another flag. This patch adds it. Thanks to Atte André Jensen
<atte at ballbreaker.dk>.
Signed-off-by: Phil Dibowitz <phil at ipom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit c7257bd2ecb7b4cc42f9f152c7c059258d434169
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Wed May 21 13:53:01 2008 -0400
USB: usb-storage: unusual_devs update for Cypress ATACB
This patch (as1101) updates the unusual_devs entry for the Cypress
ATACB pass-through. The protocol field is changed from US_PR_BULK to
US_PR_DEVICE, since the Cypress devices already set bInterfaceProtocol
to Bulk-only.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit fa38dfcc56b5f6cce787f9aaa5d1830509213802
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Tue May 20 16:59:33 2008 -0400
USB: EHCI: fix performance regression
This patch (as1099) fixes a performance regression in ehci-hcd. The
fundamental problem is that queue headers get removed from the
schedule too quickly, since the code checks for a counter advancing
rather than making an actual time-based check. The latency involved
in removing the queue header and then relinking it can severely
degrade certain kinds of workloads.
The patch replaces a simple counter with a timestamp derived from the
controller's uframe value. In addition, the delay for unlinking an
idle queue header is increased from 5 ms to 10 ms; since some
controllers (nVidia) have a latency of up to 1 ms for unlinking, this
reduces the relative impact from 20% to 10%.
Finally, a logical error left over from the IAA watchdog-timer
conversion is corrected. Now the driver will always either unlink an
idle queue header or set up a timer to unlink it later. The old code
would sometimes fail to do either.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Cc: David Brownell <david-b at pacbell.net>
Cc: Leonid <leonidv11 at gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit b40e43fcc532fa44a375a37d592e32cd0d50fe7a
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Tue May 20 16:59:10 2008 -0400
USB: EHCI: fix bug in Iso scheduling
This patch (as1098) changes the way ehci-hcd schedules its periodic
Iso transfers. That the current scheduling code is wrong is clear on
the face of it: Sometimes it returns -EL2NSYNC (meaning that an URB
couldn't be scheduled because it was submitted too late), but it does
this even when the URB_ISO_ASAP flag is set (meaning the URB should be
scheduled as soon as possible).
The new code properly implements as-soon-as-possible scheduling,
assigning the next unexpired slot as the URB's starting point. It
also is more careful about checking for Iso URB completion: It doesn't
bother to check for activity during frames that are already over,
and it allows for the possibility that some of the URB's packets may
have raced the hardware when they were submitted and so never got used
(the packet status is set to -EXDEV).
This fixes problems several people have experienced with USB video
applications.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Acked-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit d1f114d12bb4db3147e1b1342ae31083c5a79c84
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Tue May 20 16:58:58 2008 -0400
USB: EHCI: fix remote-wakeup regression
This patch (as1097) fixes a bug in the remote-wakeup handling in
ehci-hcd. The driver currently does not keep track of whether the
change-suspend feature is enabled for each port; the feature is
automatically reset the first time it is read. But recent changes to
the hub driver require that the feature be read at least twice in
order to work properly.
A bit-vector is added for storing the change-suspend feature values.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Acked-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 3a31155cfff0935e4b178f3dca733d2d60d2eb8d
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Tue May 20 16:58:29 2008 -0400
USB: EHCI: suppress unwanted error messages
This patch (as1096) fixes an annoying problem: When a full-speed or
low-speed device is plugged into an EHCI controller, it fails to
enumerate at high speed and then is handed over to the companion
controller. But usbcore logs a misleading and unwanted error message
when the high-speed enumeration fails.
The patch adds a new HCD method, port_handed_over, which asks whether
a port has been handed over to a companion controller. If it has, the
error message is suppressed.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
CC: David Brownell <david-b at pacbell.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit a8e5177583e975fc1f7c621c93956f494df9b979
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Tue May 20 16:58:11 2008 -0400
USB: EHCI: fix up root-hub TT mess
This patch (as1095) cleans up the HCD glue and several of the EHCI
bus-glue files. The ehci->is_tdi_rh_tt flag is redundant, since it
means the same thing as the hcd->has_tt flag, so it is removed and the
other flag used in its place.
Some of the bus-glue files didn't get the relinquish_port method added
to their hc_driver structures. Although that routine currently
doesn't do anything for controllers with an integrated TT, in the
future it might. So the patch adds it where it is missing.
Lastly, some of the bus-glue files have erroneous entries for their
hc_driver's suspend and resume methods. These method pointers are
specific to PCI and shouldn't be used otherwise.
(The patch also includes an invisible whitespace fix.)
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Acked-by: David Brownell <dbrownell at users.sourceforge.net>
commit 217a9081d8e69026186067711131b77f0ce219ed
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Tue May 20 16:40:42 2008 -0400
USB: add all configs to the "descriptors" attribute
This patch (as1094) changes the output of the "descriptors" binary
attribute. Now it will contain the device descriptor followed by all
the configuration descriptors, not just the descriptor for the current
config.
Userspace libraries want to have access to the kernel's cached
descriptor information, so they can learn about device characteristics
without having to wake up suspended devices. So far the only user of
this attribute is the new libusb-1.0 library; thus changing its
contents shouldn't cause any problems.
This should be considered for 2.6.26, if for no other reason than to
minimize the range of releases in which the attribute contains only the
current config descriptor.
Also, it doesn't hurt that the patch removes the device locking --
which was formerly needed in order to know for certain which config was
indeed current.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit e16362a0c8d90e9adbfe477acbe32b021823fb22
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Tue May 20 16:37:34 2008 -0400
USB: fix possible deadlock involving sysfs attributes
There is a potential deadlock when the usb_generic driver is unbound
from a device. The problem is that generic_disconnect() is called
with the device lock held, and it removes a bunch of device attributes
from sysfs. If a user task happens to be running an attribute method
at the time, the removal will block until the method returns. But at
least one of the attribute methods (the store routine for power/level)
needs to acquire the device lock!
This patch (as1093) eliminates the deadlock by moving the calls to
create and remove the sysfs attributes from the usb_generic driver
into usb_new_device() and usb_disconnect(), where they can be invoked
without holding the device lock.
Besides, the other sysfs attributes are created when the device is
registered and removed when the device is unregistered. So it seems
only fitting for the extra attributes to be created and removed at the
same time.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 62d104d0deeabd4148e49eba729d963e740e205f
Author: Matthew Garrett <mjg59 at srcf.ucam.org>
Date: Tue May 20 20:06:28 2008 +0100
USB: Firmware loader driver for USB Apple iSight camera
Uninitialised Apple iSight drivers present with a distinctive USB ID.
Once firmware has been uploaded, they disconnect and reconnect with a
new ID. At this point they can be driven by the uvcvideo driver. As this
is unique to the Apple cameras and not functionality shared by any other
UVC devices, it makes sense to provide the firmware loading
functionality in a separate driver. This driver will read an isight.fw
file extracted from the Apple driver using the tools at
http://bersace03.free.fr/ift/ and upload it to the camera. It will also
handle the case where the device loses its firmware during hibernation
and must have it reloaded.
Signed-off-by: Matthew Garrett <mjg at redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit ebb3770c01a8afd049e3e91b0a026dcdfcb2da9f
Author: Ray Molenkamp <rmolenkamp at matrixorbital.ca>
Date: Wed May 21 17:06:26 2008 -0600
USB: FTDI_SIO : Add support for Matrix Orbital PID Range
This patch adds support for the range of PIDs
that have been allocated for FTDI based devices
at Matrix Orbital.
A small number of units have been shipped early 2008
with a faulty USB Descriptor. Products that may have
this issue have been marked with the existing quirk to
work around the problem.
Signed-off-by: R. Molenkamp <rmolenkamp at matrixorbital.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 4bd27972e2c35b1e9e672ff05e0a781644f9c905
Merge: a7f75d3bed2871655d9806c62a5d6f46552b9a4a dca026139317dcbc642a30320d551f559692182f
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu May 29 10:04:54 2008 -0700
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
[CPUFREQ] fix double unlock of cpu_policy_rwsem in drivers/cpufreq/cpufreq.c
commit a7f75d3bed2871655d9806c62a5d6f46552b9a4a
Merge: 3897b82c3586e774260d6bca56cc1efca79cd335 6715930654e06c4d2e66e718ea159079f71838f4
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu May 29 09:26:17 2008 -0700
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: re-tune NUMA topologies
sched: stop wake_affine from causing serious imbalance
sched: fix sched_clock_cpu()
revert ("sched: fair-group: SMP-nice for group scheduling")
sched: cleanup
show_schedstat(): fix memleak
sched: unite unlikely pairs in rt_policy() and schedule_debug()
revert ("sched: fair: weight calculations")
commit dca026139317dcbc642a30320d551f559692182f
Author: Lothar Waßmann <LW at KARO-electronics.de>
Date: Thu May 29 17:54:52 2008 +0200
[CPUFREQ] fix double unlock of cpu_policy_rwsem in drivers/cpufreq/cpufreq.c
In drivers/cpufreq/cpufreq.c the function cpufreq_add_dev() takes the
error exit 'err_out_unregister' from different places once with the
'cpu_policy_rwsem' lock held, once with the lock released:
| if (ret)
| goto err_out_unregister;
| }
|
| policy->governor = NULL; /* to assure that the starting sequence is
| * run in cpufreq_set_policy */
|
| /* set default policy */
| ret = __cpufreq_set_policy(policy, &new_policy);
| policy->user_policy.policy = policy->policy;
| policy->user_policy.governor = policy->governor;
|
| unlock_policy_rwsem_write(cpu);
|
| if (ret) {
| dprintk("setting policy failed\n");
| goto err_out_unregister;
| }
This leads to the following error message in case of a failing
__cpufreq_set_policy() call:
=====================================
[ BUG: bad unlock balance detected! ]
-------------------------------------
swapper/1 is trying to release lock (&per_cpu(cpu_policy_rwsem, cpu)) at:
[<c01b4564>] unlock_policy_rwsem_write+0x30/0x40
but there are no more locks to release!
other info that might help us debug this:
1 lock held by swapper/1:
#0: (sysdev_drivers_lock){--..}, at: [<c018fd18>] sysdev_driver_register+0x74/0x130
stack backtrace:
[<c002f588>] (dump_stack+0x0/0x14) from [<c00692fc>] (print_unlock_inbalance_bug+0xc8/0x104)
[<c0069234>] (print_unlock_inbalance_bug+0x0/0x104) from [<c006b7ac>] (lock_release_non_nested+0xc4/0x19c)
r6:00000028 r5:c3c1ab80 r4:c01b4564
[<c006b6e8>] (lock_release_non_nested+0x0/0x19c) from [<c006b9e0>] (lock_release+0x15c/0x18c)
r8:60000013 r7:00000001 r6:c01b4564 r5:c0541bb4 r4:c3c1ab80
[<c006b884>] (lock_release+0x0/0x18c) from [<c0061ba0>] (up_write+0x24/0x30)
r8:c0541b80 r7:00000000 r6:ffffffea r5:c3c34828 r4:c0541b8c
[<c0061b7c>] (up_write+0x0/0x30) from [<c01b4564>] (unlock_policy_rwsem_write+0x30/0x40)
r4:c3c34884
[<c01b4534>] (unlock_policy_rwsem_write+0x0/0x40) from [<c01b4c40>] (cpufreq_add_dev+0x324/0x398)
[<c01b491c>] (cpufreq_add_dev+0x0/0x398) from [<c018fd64>] (sysdev_driver_register+0xc0/0x130)
[<c018fca4>] (sysdev_driver_register+0x0/0x130) from [<c01b3574>] (cpufreq_register_driver+0xbc/0x174)
Signed-off-by: Lothar Waßmann <LW at KARO-electronics.de>
Signed-off-by: Dave Jones <davej at redhat.com>
commit 6715930654e06c4d2e66e718ea159079f71838f4
Merge: ea3f01f8afd3bc5daff915cc4ea5cc5ea9e7d427 e490517a039a99d692cb3a5561941b0a5f576172
Author: Ingo Molnar <mingo at elte.hu>
Date: Thu May 29 16:05:05 2008 +0200
Merge commit 'linus/master' into sched-fixes-for-linus
commit ea3f01f8afd3bc5daff915cc4ea5cc5ea9e7d427
Author: Ingo Molnar <mingo at elte.hu>
Date: Thu May 29 14:32:23 2008 +0200
sched: re-tune NUMA topologies
improve the sysbench ramp-up phase and its peak throughput on
a 16way NUMA box, by turning on WAKE_AFFINE:
tip/sched tip/sched+wake-affine
-------------------------------------------------
1: 700 830 +15.65%
2: 1465 1391 -5.28%
4: 3017 3105 +2.81%
8: 5100 6021 +15.30%
16: 10725 10745 +0.19%
32: 10135 10150 +0.16%
64: 9338 9240 -1.06%
128: 8599 8252 -4.21%
256: 8475 8144 -4.07%
-------------------------------------------------
SUM: 57558 57882 +0.56%
this change also improves lat_ctx from 6.69 usecs to 1.11 usec:
$ ./lat_ctx -s 0 2
"size=0k ovr=1.19
2 1.11
$ ./lat_ctx -s 0 2
"size=0k ovr=1.22
2 6.69
in sysbench it's an overall win with some weakness at the lots-of-clients
side. That happens because we now under-balance this workload
a bit. To counter that effect, turn on NEWIDLE:
wake-idle wake-idle+newidle
-------------------------------------------------
1: 830 834 +0.43%
2: 1391 1401 +0.65%
4: 3105 3091 -0.43%
8: 6021 6046 +0.42%
16: 10745 10736 -0.08%
32: 10150 10206 +0.55%
64: 9240 9533 +3.08%
128: 8252 8355 +1.24%
256: 8144 8384 +2.87%
-------------------------------------------------
SUM: 57882 58591 +1.21%
as a bonus this not only improves the many-clients case but
also improves the (more important) rampup phase.
sysbench is a workload that quickly breaks down if the
scheduler over-balances, so since it showed an improvement
under NEWIDLE this change is definitely good.
commit 12293bf91126ad253a25e2840b307fdc7c2754c3
Author: Alexey Dobriyan <adobriyan at parallels.com>
Date: Thu May 29 03:19:37 2008 -0700
netfilter: nf_conntrack_expect: fix error path unwind in nf_conntrack_expect_init()
Signed-off-by: Alexey Dobriyan <adobriyan at parallels.com>
Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit b3137bc8e77962a8e3b4dfdc1bcfd38e437bd278
Author: Mike Galbraith <efault at gmx.de>
Date: Thu May 29 11:11:41 2008 +0200
sched: stop wake_affine from causing serious imbalance
Prevent short-running wakers of short-running threads from overloading a single
cpu via wakeup affinity, and wire up disconnected debug option.
Signed-off-by: Mike Galbraith <efault at gmx.de>
Signed-off-by: Peter Zijlstra <peterz at infradead.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit a381759d6ad5c5dea5a981918e0b4493e9b66ac7
Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
Date: Thu May 29 10:07:15 2008 +0200
sched: fix sched_clock_cpu()
Make sched_clock_cpu() return 0 before it has been initialized and avoid
corrupting its state due to doing so.
This fixes the weird printk timestamp jump reported.
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
commit 6363ca57c76b7b83639ca8c83fc285fa26a7880e
Author: Ingo Molnar <mingo at elte.hu>
Date: Thu May 29 11:28:57 2008 +0200
revert ("sched: fair-group: SMP-nice for group scheduling")
Yanmin Zhang reported:
Comparing with 2.6.25, volanoMark has big regression with kernel 2.6.26-rc1.
It's about 50% on my 8-core stoakley, 16-core tigerton, and Itanium Montecito.
With bisect, I located the following patch:
| 18d95a2832c1392a2d63227a7a6d433cb9f2037e is first bad commit
| commit 18d95a2832c1392a2d63227a7a6d433cb9f2037e
| Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
| Date: Sat Apr 19 19:45:00 2008 +0200
|
| sched: fair-group: SMP-nice for group scheduling
Revert it so that we get v2.6.25 behavior.
Bisected-by: Yanmin Zhang <yanmin_zhang at linux.intel.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 4285f594f84d1f0641fc962d00e6638dec4a19c4
Author: Ingo Molnar <mingo at elte.hu>
Date: Fri May 16 17:47:14 2008 +0200
sched: cleanup
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit c6fba5451a84143f34056a465e72ba187fcc651c
Author: Adrian Bunk <bunk at kernel.org>
Date: Wed May 14 16:22:59 2008 -0700
show_schedstat(): fix memleak
The Coverity checker spotted a memleak introduced by commit
39106dcf85285e78f3b290022122c76f851379b8 (cpumask: use new cpus_scnprintf
function).
It seems the kfree() got lost between v2 and v3 of this patch...
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Cc: Mike Travis <travis at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 3f33a7ce9567ded582af1ab71f9802165fe12f09
Author: Roel Kluin <roel.kluin at gmail.com>
Date: Tue May 13 23:44:11 2008 +0200
sched: unite unlikely pairs in rt_policy() and schedule_debug()
Removes obfuscation and may improve assembly.
Signed-off-by: Roel Kluin <roel.kluin at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit f9305d4a0968201b2818dbed0dc8cb0d4ee7aeb3
Author: Ingo Molnar <mingo at elte.hu>
Date: Thu May 29 11:23:17 2008 +0200
revert ("sched: fair: weight calculations")
Yanmin Zhang reported:
Comparing with kernel 2.6.25, sysbench+mysql(oltp, readonly) has many
regressions with 2.6.26-rc1:
1) 8-core stoakley: 28%;
2) 16-core tigerton: 20%;
3) Itanium Montvale: 50%.
Bisect located this patch:
| 8f1bc385cfbab474db6c27b5af1e439614f3025c is first bad commit
| commit 8f1bc385cfbab474db6c27b5af1e439614f3025c
| Author: Peter Zijlstra <a.p.zijlstra at chello.nl>
| Date: Sat Apr 19 19:45:00 2008 +0200
|
| sched: fair: weight calculations
Revert it to the 2.6.25 state.
Bisected-by: Yanmin Zhang <yanmin_zhang at linux.intel.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 8c3a01d0c259ec8b283c52dbeadda0122582a68b
Merge: 4c8411f8c115def968820a4df6658ccfd55d7f1a c97c23e38625f59e3e9869664eeeb0cab1822948
Author: David S. Miller <davem at davemloft.net>
Date: Thu May 29 01:49:04 2008 -0700
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
commit 4c8411f8c115def968820a4df6658ccfd55d7f1a
Author: Arjan van de Ven <arjan at linux.intel.com>
Date: Thu May 29 01:32:47 2008 -0700
bluetooth: fix locking bug in the rfcomm socket cleanup handling
in net/bluetooth/rfcomm/sock.c, rfcomm_sk_state_change() does the
following operation:
if (parent && sock_flag(sk, SOCK_ZAPPED)) {
/* We have to drop DLC lock here, otherwise
* rfcomm_sock_destruct() will dead lock. */
rfcomm_dlc_unlock(d);
rfcomm_sock_kill(sk);
rfcomm_dlc_lock(d);
}
}
which is fine, since rfcomm_sock_kill() will call sk_free() which will call
rfcomm_sock_destruct() which takes the rfcomm_dlc_lock()... so far so good.
HOWEVER, this assumes that the rfcomm_sk_state_change() function always gets
called with the rfcomm_dlc_lock() taken. This is the case for all but one
case, and in that case where we don't have the lock, we do a double unlock
followed by an attempt to take the lock, which due to underflow isn't
going anywhere fast.
This patch fixes this by moving the stragling case inside the lock, like
the other usages of the same call are doing in this code.
This was found with the help of the www.kerneloops.org project, where this
deadlock was observed 51 times at this point in time:
http://www.kerneloops.org/search.php?search=rfcomm_sock_destruct
Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
Acked-by: Marcel Holtmann <marcel at holtmann.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit c97c23e38625f59e3e9869664eeeb0cab1822948
Author: Senthil Balasubramanian <senthilkumar at atheros.com>
Date: Wed May 28 23:15:32 2008 +0530
mac80211: fix alignment issue with compare_ether_addr()
This addresses an alignment issue with compare_ether_addr().
The addresses passed to compare_ether_addr should be two bytes aligned.
It may function properly in x86 platform. However may not work properly
on IA-64 or ARM processor.
This also fixes a typo in mlme.c where the sk_buff struct name is incorect.
Though sizeof() works for any incorrect structure pointer name as its just
a pointer length that we want, lets just fix it.
Signed-off-by: Senthil Balasubramanian <senthilkumar at atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez at atheros.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 70d251b24c44ab2fcba1807a5206e844cf10eb38
Author: Senthil Balasubramanian <senthilkumar at atheros.com>
Date: Wed May 28 20:08:12 2008 +0530
mac80211: Fix for NULL pointer dereference in sta_info_get()
This addresses a NULL pointer dereference in sta_info_get().
TID and sta_info are extracted in ADDBA Timer expiry function
through the timer handler's argument.
The problem is extracging the TID (which was stored in
timer_to_tid[] array of type "u8") through "int *" typecast which
may also yield unwanted bytes for the MSB of TID that results
in incorrect sta_info and ieee80211_local pointers.
ieee80211_local pointer is NULL as illustrated below, it crashes in
sta_info_get(). The problem started when extracting ieee80211_local
pointer out of sta_info iteself and eventually crashed in
stat_info_get().
The proper way to fix is to change the data type of TID to u8
instead of u16. However changing all the occurences requires
some prototype changes as well. We should fix this in upcoming
patches.
Signed-off-by: Senthil Balasubramanian <senthilkumar at atheros.com>
Signed-off-by: Luis Rodriguez <lrodriguez at atheros.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit f6d97104890203ba9c2cf8e34894c4c8e64cb880
Author: Yi Zhu <yi.zhu at intel.com>
Date: Tue May 27 17:50:50 2008 +0300
mac80211: fix a typo in ieee80211_handle_filtered_frame comment
fix a typo in ieee80211_handle_filtered_frame comment
Signed-off-by: Yi Zhu <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit a7624837261b55259d4a88309fd88529643fbb80
Author: Jussi Kivilinna <jussi.kivilinna at mbnet.fi>
Date: Tue May 27 11:15:08 2008 +0300
rndis_wlan: add missing range check for power_output modparam
Range check for power_output were missing.
Signed-off-by: Jussi Kivilinna <jussi.kivilinna at mbnet.fi>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 135a5484c3e0c6710035630b630cef3c856b78e2
Author: Guy Cohen <guy.cohen at intel.com>
Date: Tue May 27 11:29:35 2008 +0800
iwlwifi: fix rate scale TLC column selection bug
This patch fixes a case that a wrong maximal rate is selected when
searching for better configurations.
Signed-off-by: Guy Cohen <guy.cohen at intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 47cfd463962ab0748ecbad761ff6ef2916b54aac
Author: Guy Cohen <guy.cohen at intel.com>
Date: Tue May 27 11:29:34 2008 +0800
iwlwifi: fix exit from stay_in_table state
When exiting from stay in table state (e.g. timer expiration),
all the statistics are reset and the RS flow should not continue
but only after enough statistics are collected again.
Signed-off-by: Guy Cohen <guy.cohen at intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 4364623cb79d02945ace7a4faa1f11e617dde198
Author: Scott Ashcroft <scott.ashcroft at talk21.com>
Date: Tue May 27 00:06:15 2008 +0300
rndis_wlan: Make connections to TKIP PSK networks work
This patch allows the rndis_wlan driver to connect to TKIP PSK
networks. It uses the ASSOCIATION_INFORMATION RNDIS call to pull back
the IEs and sends them back to userspace using wireless events. Tested
on a few wireless networks I have access to. Based on the similar
code in ndiswrapper.
Signed-off-by: Scott Ashcroft <scott.ashcroft at talk21.com>
[edit: cleanups]
Signed-off-by: Jussi Kivilinna <jussi.kivilinna at mbnet.fi>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit d4231ca3e162387a2b6964dacaa83604e065c4e9
Author: Abhijeet Kolekar <abhijeet.kolekar at intel.com>
Date: Fri May 23 10:15:26 2008 -0700
mac80211 : Fixes the status message for iwconfig
iwconfig was showing incorrect status messages when disassociated.
Patch fixes this by always checking for association status in
ioctl calls for getting ap address.
Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar at intel.com>
Acked-by: Dan Williams <dcbw at redhat.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 633257d3db547e7553500f05e0aa2692c876d7a5
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Fri May 23 18:14:02 2008 +0200
rt2x00: Use atomic interface iteration in irq context
rt2x00lib_beacondone() is called from interrupt context,
this means we cannot use the mac80211 interface iterator
that uses the rtnl lock (since that uses a mutex which can sleep).
Instead we should use the atomic mac80211 interface iterator.
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit f06a0f486dc8bbe8808f46b81fbfd73241529fae
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Fri May 23 18:13:56 2008 +0200
rt2x00: Reset antenna RSSI after switch
When the antenna configuration has changed we should reset
the antenna RSSI value. Otherwise the value will be influenced
by the previous configuration quality which in turn will affect
the antenna diversity.
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 2088d4174e4292aef892bb7095fc3c3ea5bd117c
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Fri May 23 18:13:49 2008 +0200
rt2x00: Don't count retries as failure
Link quality estimation became quite low for all rt2x00 drivers
because the number of retries it took to send the frame were
counted as failure.
This does not correspond to the legacy driver link quality calculation,
by not counting it we will send somewhat more optimistic values to
mac80211.
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 0f3e63a55b1a7b695a79bf3eec2ff5ab6b336037
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Fri May 23 18:13:41 2008 +0200
rt2x00: Fix memleak in tx() path
When the tx() handler runs while the device has disapeared,
we did return NETDEV_TX_OK but didn't free the skb.
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 9381be059bf5831d259e8735005cfa35b7488543
Author: Tomas Winkler <tomas.winkler at intel.com>
Date: Fri May 23 01:36:36 2008 +0300
mac80211: reorder channel and freq reporting in wext scan report
This patch switch order of channel and freq (SIOCGIWFREQ) reports
in scan results in order to overcome wpa_supplicant inability
to handle channel numbers in 5.2Ghz band.
Wext reporting channel number is ambiguous as channels 7-12 (802.11j)
exist on both bands.
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
Acked-by: Dan Williams <dcbw at redhat.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 3bf0a32e22fedc0b46443699db2d61ac2a883ac4
Author: Michael Buesch <mb at bu3sch.de>
Date: Thu May 22 16:32:16 2008 +0200
b43: Fix controller restart crash
This fixes a kernel crash on rmmod, in the case where the controller
was restarted before doing the rmmod.
Signed-off-by: Michael Buesch <mb at bu3sch.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 167ad6f7a2b2ae58dfaa46620b9b3212594f38e6
Author: Tomas Winkler <tomas.winkler at intel.com>
Date: Wed May 21 18:17:05 2008 +0300
mac80211: fix ieee80211_rx_bss_put/get imbalance
This patch fixes iee80211_rx_bss_put/get imbalance
introduced by 'mac80211: enable IBSS merging' patch.
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 679fda1aa49fddf938bb699df7867c01988371ab
Author: Nicolas Kaiser <nikai at nikai.net>
Date: Tue May 20 18:42:54 2008 +0200
net/mac80211: always true conditionals
Correct always true conditionals.
Signed-off-by: Nicolas Kaiser <nikai at nikai.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 6b4bec010d888c5b8c731aa596635cd83dd3416c
Author: Michael Buesch <mb at bu3sch.de>
Date: Tue May 20 12:16:28 2008 +0200
b43: Upload both beacon templates on initial load
This updates the beacon template code to upload both templates,
if we never uploaded one before.
Signed-off-by: Michael Buesch <mb at bu3sch.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit bc1b1fb2753873314ad1bf56bc7d5b8dd447cd2a
Author: Andrea Merello <andrea.merello at gmail.com>
Date: Sat May 10 13:34:16 2008 +0200
rtl8180: fix wrong parameter in grf5101_rf_set_channel
The grf5101 RF code needs to invoke grf5101_write_phy_antenna every time the
channel is being switch.
This should be done passing the channel number to that function.
Incorrectly we were passing the same value that is written on the
channel RF register.
This may cause problems when operating on ch 14.
This patch fixes it.
Thanks to Alessandro Di Marco who found this issue!
Signed-off-by: Andrea Merello <andreamrl at tiscali.it>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 0a0ab41e833c8184c6d4ab663f137d5bbd50e049
Author: Andrea Merello <andrea.merello at gmail.com>
Date: Sat May 10 13:32:34 2008 +0200
rtl8180: fix wrong parameter in max2820_rf_set_channel
The max2820 RF code needs to invoke max2820_write_phy_antenna every time the
channel is being switch.
This should be done passing the channel number to that function.
Incorrectly we were passing the same value that is written on the
channel RF register.
This may cause problems when operating on ch 14.
This patch fixes it.
Thanks to Alessandro Di Marco who found this issue!
Signed-off-by: Andrea Merello <andreamrl at tiscali.it>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 0823b2c3c10a4db21cd39a8c72cda96b4dd6d914
Author: Andrea Merello <andreamrl at tiscali.it>
Date: Sat May 10 13:30:12 2008 +0200
rtl8180: fix wrong parameter in sa2400_rf_set_channel
The sa2400 RF code needs to invoke sa2400_write_phy_antenna every time the
channel is being switch.
This should be done passing the channel number to that function.
Incorrectly we were passing the same value that is written on the
channel RF register.
This may cause problems when operating on ch 14.
This patch fixes it.
Thanks to Alessandro Di Marco who found this issue!
Signed-off-by: Andrea Merello <andreamrl at tiscali.it>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 6f6c218f68e632e4596cae6e6d43658d26a5e0fe
Author: John W. Linville <linville at tuxdriver.com>
Date: Tue May 27 17:01:55 2008 -0400
rtl8180: avoid NULL dereference in max2820_rf_set_channel
The static function max2820_rf_set_channel is called with conf == NULL
within its compilation unit. Originally this defaulted to b/g channel
1, but "cfg80211 API for channels/bitrates, mac80211 and driver
conversion" (commit 8318d78a44d49ac1edf2bdec7299de3617c4232e) mistakenly
dropped this check. This patch minimally restores the expected
behavior.
Reported-by: Colin Lai <colin_sh at 163.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 3897b82c3586e774260d6bca56cc1efca79cd335
Merge: 0a2ce2ffc358da96792d514c1024b72c52be9cc1 4dcc29e1574d88f4465ba865ed82800032f76418
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed May 28 12:58:12 2008 -0700
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Workaround for RSE issue
commit 471637a575329f9250e7e4099e84084820a35e11
Author: Antonio Ospite <ospite at studenti.unina.it>
Date: Wed May 28 14:35:52 2008 -0400
Input: pxa27x_keypad - miscellaneous fixes
1. Set input bits for direct keys codes
2. Set input bits for rotary encoder codes only if rotary
encoder is enabled
3. Enable EV_REL only if rotary encoder is enabled and rel_codes
are set up
Signed-off-by: Antonio Ospite <ao2 at openezx.org>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit b33cb815b565a94c654a0fe8e62e36f5b4053888
Author: Jason Wessel <jason.wessel at windriver.com>
Date: Wed May 28 12:49:57 2008 -0500
kgdbts: Use HW breakpoints with CONFIG_DEBUG_RODATA
Whenever CONFIG_DEBUG_RODATA is set in the kernel config many kernel
text sections become read-only, and the use of software breakpoints in
the kgdb tests will cause the kernel to fail to complete the start up.
Until such time that there is an official API for modifying read-only
text sections hardware breakpoints must be used to run the do_fork or
sys_open tests or the tests get skipped.
Also fix the duplicated include reported by:
Huang Weiyi <weiyi.huang at gmail.com>
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
commit 827e609b4581282b98bdf7666f6e93ff1bd1a63e
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Wed May 28 12:49:56 2008 -0500
kgdb: use common ascii helpers and put_unaligned_be32 helper
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
commit 0a2ce2ffc358da96792d514c1024b72c52be9cc1
Author: David Howells <dhowells at redhat.com>
Date: Wed May 28 16:49:01 2008 +0100
Fix FRV minimum slab/kmalloc alignment
> +#define ARCH_KMALLOC_MINALIGN (sizeof(long) * 2)
> +#define ARCH_SLAB_MINALIGN (sizeof(long) * 2)
This doesn't work if SLAB is selected and slab debugging is enabled as
these are passed to the preprocessor, and the preprocessor doesn't
understand sizeof.
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b4412323cc954bd0a2144b1c2ed573dd2eddb32c
Merge: dc1d60a014aa9614518f9856ff661716d0969ffd d6de8be711b28049a5cb93c954722c311c7d3f7f
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed May 28 08:00:51 2008 -0700
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
cfq-iosched: fix RCU problem in cfq_cic_lookup()
block: make blktrace use per-cpu buffers for message notes
Added in elevator switch message to blktrace stream
Added in MESSAGE notes for blktraces
block: reorder cfq_queue to save space on 64bit builds
block: Move the second call to get_request to the end of the loop
splice: handle try_to_release_page() failure
splice: fix sendfile() issue with relay
commit dc1d60a014aa9614518f9856ff661716d0969ffd
Author: David Howells <dhowells at redhat.com>
Date: Wed May 28 15:36:34 2008 +0100
FRV: Specify the minimum slab/kmalloc alignment
Specify the minimum slab/kmalloc alignment to be 8 bytes. This fixes a
crash when SLOB is selected as the memory allocator. The FRV arch needs
this so that it can use the load- and store-double instructions without
faulting. By default SLOB sets the minimum to be 4 bytes.
Signed-off-by: David Howells <dhowells at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5e55843bb8ed1ec7d134a759c53e34beb1618952
Author: Vegard Nossum <vegard.nossum at gmail.com>
Date: Wed May 28 13:55:24 2008 +0100
MN10300: Fix typo in header guard
Fix a typo in the header guard of asm/ipc.h.
Signed-off-by: Vegard Nossum <vegard.nossum at gmail.com>
Signed-off-by: David Howells <dhowells at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d6de8be711b28049a5cb93c954722c311c7d3f7f
Author: Jens Axboe <jens.axboe at oracle.com>
Date: Wed May 28 14:46:59 2008 +0200
cfq-iosched: fix RCU problem in cfq_cic_lookup()
cfq_cic_lookup() needs to properly protect ioc->ioc_data before
dereferencing it and also exclude updaters of ioc->ioc_data as well.
Also add a number of comments documenting why the existing RCU usage
is OK.
Thanks a lot to "Paul E. McKenney" <paulmck at linux.vnet.ibm.com> for
review and comments!
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 64565911cdb57c2f512a9715b985b5617402cc67
Author: Jens Axboe <jens.axboe at oracle.com>
Date: Wed May 28 14:45:33 2008 +0200
block: make blktrace use per-cpu buffers for message notes
Currently it uses a single static char array, but that risks
being corrupted when multiple users issue message notes at the
same time. Make the buffers dynamically allocated when the trace
is setup and make them per-cpu instead.
The default max message size of 1k is also very large, the
interface is mainly for small text notes. So shrink it to 128 bytes.
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 4722dc52a891ab6cb2d637ddb87233e0ce277827
Author: Alan D. Brunelle <Alan.Brunelle at hp.com>
Date: Tue May 27 14:55:00 2008 +0200
Added in elevator switch message to blktrace stream
Signed-off-by: Alan D. Brunelle <alan.brunelle at hp.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 9d5f09a424a67ddb959829894efb4c71cbf6d600
Author: Alan D. Brunelle <Alan.Brunelle at hp.com>
Date: Tue May 27 14:54:41 2008 +0200
Added in MESSAGE notes for blktraces
Allows messages to be inserted into blktrace streams.
Signed-off-by: Alan D. Brunelle <alan.brunelle at hp.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit be754d2c2161c0cce11d62727016985ecb76831b
Author: Richard Kennedy <richard at rsk.demon.co.uk>
Date: Fri May 23 06:52:00 2008 +0200
block: reorder cfq_queue to save space on 64bit builds
saves 8 bytes of padding & increases objects/slab from 30 to 32 on my
AMD64 config
Signed-off-by: Richard Kennedy <richard at rsk.demon.co.uk>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 05caf8dbc1880415df3378cfd114d832c9618b60
Author: Zhang, Yanmin <yanmin_zhang at linux.intel.com>
Date: Thu May 22 15:13:29 2008 +0200
block: Move the second call to get_request to the end of the loop
In function get_request_wait, the second call to get_request could be
moved to the end of the while loop, because if the first call to
get_request fails, the second call will fail without sleep.
Signed-off-by: Zhang Yanmin <yanmin.zhang at intel.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit ca39d651d17df49b6d11f851d56c0ce0ce01ea1a
Author: Jens Axboe <jens.axboe at oracle.com>
Date: Tue May 20 21:27:41 2008 +0200
splice: handle try_to_release_page() failure
splice currently assumes that try_to_release_page() always suceeds,
but it can return failure. If it does, we cannot steal the page.
Acked-by: Mingming Cao <cmm at us.ibm.com
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit a82c53a0e3f57f02782330372b7adad67b417645
Author: Tom Zanussi <zanussi at comcast.net>
Date: Fri May 9 13:28:36 2008 +0200
splice: fix sendfile() issue with relay
Splice isn't always incrementing the ppos correctly, which broke
relay splice.
Signed-off-by: Tom Zanussi <zanussi at comcast.net>
Tested-by: Dan Williams <dan.j.williams at intel.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 57f5b1590f2d801a3a7f072e2c65f14d4545852c
Author: Dmitry Torokhov <dmitry.torokhov at gmail.com>
Date: Wed May 28 00:54:01 2008 -0400
Input: atkbd - mark keyboard as disabled when suspending/unloading
This will shut off garbage that may come from KBD port during resume.
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit 1ec7d99c16e69a9ed8ffeaa6c1846025b84bebad
Merge: 3dbfd0801bbbaf2800d7497d83d743a614430e82 9e4f2e8d4ddb04ad16a3828cd9a369a5a5287009
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue May 27 18:47:59 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
pciehp: add message about pciehp_slot_with_bus option
pci hotplug core: add check of duplicate slot name
pciehp: move msleep after power off
pciehp: poll cmd completion if hotplug interrupt is disabled
pciehp: fix slow probing
pciehp: fix NULL dereference in interrupt handler
shpchp: add message about shpchp_slot_with_bus option
PCI: don't enable ASPM on devices with mixed PCIe/PCI functions
commit 9e4f2e8d4ddb04ad16a3828cd9a369a5a5287009
Author: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Date: Tue May 27 19:07:33 2008 +0900
pciehp: add message about pciehp_slot_with_bus option
Some (broken?) platform assign the same slot name to multiple hotplug
slots. On such system, slot initialization would fail because of name
collision. The pciehp driver already have a "slot_with_bus" module
option which adds the bus number into the slot name. This patch adds
the message about this module option that will be displayed when slot
name collision is detected.
Signed-off-by: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit a86161b3134465f072d965ca7508ec9c1e2e52c7
Author: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Date: Tue May 27 19:07:01 2008 +0900
pci hotplug core: add check of duplicate slot name
Fix the following errors reported by Jan C. Nordholz in
http://bugzilla.kernel.org/show_bug.cgi?id=10751.
kobject_add_internal failed for 2 with -EEXIST, don't try to register things with the same name in the same directory.
Pid: 1, comm: swapper Tainted: G W 2.6.26-rc3 #1
[<c0266980>] kobject_add_internal+0x140/0x190
[<c0266afd>] kobject_init_and_add+0x2d/0x40
[<c027bc91>] pci_hp_register+0x81/0x2f0
[<c027fd07>] pciehp_probe+0x1a7/0x470
[<c01b3b84>] sysfs_add_one+0x44/0xa0
[<c01b3c1f>] sysfs_addrm_start+0x3f/0xb0
[<c01b497a>] sysfs_create_link+0x8a/0xf0
[<c0279570>] pcie_port_probe_service+0x50/0x80
[<c02e0545>] driver_sysfs_add+0x55/0x70
[<c02e0662>] driver_probe_device+0x82/0x180
[<c02e07cc>] __driver_attach+0x6c/0x70
[<c02dfe0a>] bus_for_each_dev+0x3a/0x60
[<c05db2d0>] pcied_init+0x0/0x80
[<c02e04e6>] driver_attach+0x16/0x20
[<c02e0760>] __driver_attach+0x0/0x70
[<c02e0341>] bus_add_driver+0x1a1/0x220
[<c05db2d0>] pcied_init+0x0/0x80
[<c02e09cd>] driver_register+0x4d/0x120
[<c05db050>] ibm_acpiphp_init+0x0/0x190
[<c0125aab>] printk+0x1b/0x20
[<c05db2d0>] pcied_init+0x0/0x80
[<c05db2de>] pcied_init+0xe/0x80
[<c05c751a>] kernel_init+0x10a/0x300
[<c0120138>] schedule_tail+0x18/0x50
[<c0103b9a>] ret_from_fork+0x6/0x1c
[<c05c7410>] kernel_init+0x0/0x300
[<c05c7410>] kernel_init+0x0/0x300
[<c010485b>] kernel_thread_helper+0x7/0x1c
=======================
pci_hotplug: Unable to register kobject '2'<3>pciehp: pci_hp_register failed with error -22
Slot with the same name can be registered multiple times if shpchp or
pciehp driver is loaded after acpiphp is loaded because ACPI based
hotplug driver and Native OS hotplug driver trying to handle the same
physical slot. In this case, current pci_hotplug core will call
kobject_init_and_add() muliple time with the same name. This is the
cause of this problem. To fix this problem, this patch adds the check
into pci_hp_register() to see if the slot with the same name.
Signed-off-by: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit 0711c70ec0e9d2c002b1e9b5fb9f21e49d77f4fd
Author: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Date: Tue May 27 19:06:22 2008 +0900
pciehp: move msleep after power off
According to the PCI Express specification, we must wait for at least
1 second after turning power off before taking any action that relies
on power having been removed from the slot/adapter. For this, current
pciehp wait for 1 second after issuing the power off command in
hpc_power_off_slot() function. But waiting for 1 second in
hpc_power_off_slot() can make pciehp probing slow-down because pciehp
probe code calls hpc_power_off_slot() if the slot is not occupied just
in case. We don't need to wait for 1 second at the pciehp probe time
because there is no action on that empty slot. So move 1 second wait
from hpc_power_off_slot() to the caller of hpc_power_off_slot().
Signed-off-by: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit 6592e02ae4bd7b277230aa0c5821588a13b9d8e3
Author: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Date: Tue May 27 19:05:26 2008 +0900
pciehp: poll cmd completion if hotplug interrupt is disabled
Fix improper long wait for command completion in pciehp probing.
As described in PCI Express specification, software notification is
not generated if the command that occurs as a result of a write to the
Slot Control register that disables software notification of command
completed events. Since pciehp driver doesn't take it into account,
such command is issued in pciehp probing, and it causes improper long
wait for command completion.
This patch changes the pciehp driver to take such command into
account.
Signed-off-by: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit 5808639bfa98d69f77a481d759570d85f164fea0
Author: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Date: Tue May 27 19:04:30 2008 +0900
pciehp: fix slow probing
Fix the "pciehp probing slow" problem reported from Jan C. Nordholz in
http://bugzilla.kernel.org/show_bug.cgi?id=10751.
The command completed bit in Slot Status register applies only to
commands issued to control the attention indicator, power indicator,
power controller, or electromechanical interlock. However, writes to
other parts of the Slot Control register would end up writing to the
control fields. Hence, any write to Slot Control register is
considered as a command. However, if the controller doesn't support
any of attention indicator, power indicator, power controller and
electromechanical interlock, command completed bit would not set in
writing to Slot Control register. In this case, we should not wait for
command completed bit set, otherwise all commands would be considered
not completed in timeout seconds (1 sec.).
The cause of the problem is pciehp driver didn't take this situation
into account. This patch changes pciehp to take it into account. This
patch also add the check for "No Command Completed Support" bit in
Slot Capability register. If it is set, we should not wait for command
completed bit set as well.
This problem seems to be revealed by the commit
c27fb883dffe11aa4cb35ecea1fa1832ba45d4da that fixed the bug that
pciehp did not wait for command completed properly (pciehp just
ignored the command completion event).
Signed-off-by: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit dbd79aed1aea2bece0bf43cc2ff3b2f9baf48a08
Author: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Date: Tue May 27 19:03:16 2008 +0900
pciehp: fix NULL dereference in interrupt handler
Fix the following NULL dereference problem reported from Pierre Ossman
and Ingo Molnar.
pciehp: HPC vendor_id 8086 device_id 27d0 ss_vid 0 ss_did 0
pciehp: pciehp_find_slot: slot (device=0x0) not found
BUG: unable to handle kernel NULL pointer dereference at 0000000000000070
IP: [<ffffffff80494a8b>] pciehp_handle_presence_change+0x7e/0x113
PGD 0
Oops: 0000 [1]
CPU 0
Modules linked in:
Pid: 1, comm: swapper Tainted: G W 2.6.26-rc3-sched-devel.git-00001-g2b99b26-dirty #170
RIP: 0010:[<ffffffff80494a8b>] [<ffffffff80494a8b>] pciehp_handle_presence_change+0x7e/0x113
RSP: 0000:ffff81003f83fbb0 EFLAGS: 00010046
RAX: 0000000000000039 RBX: 0000000000000000 RCX: 0000000000000000
RDX: 0000000000000000 RSI: 0000000000000001 RDI: 0000000000000046
RBP: ffff81003f83fbd0 R08: 0000000000000001 R09: ffffffff80245103
R10: 0000000000000020 R11: 0000000000000000 R12: ffff81003ea53a30
R13: 0000000000000000 R14: 0000000000000011 R15: ffffffff80495926
FS: 0000000000000000(0000) GS:ffffffff80be7400(0000) knlGS:0000000000000000
CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b
CR2: 0000000000000070 CR3: 0000000000201000 CR4: 00000000000006a0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
Process swapper (pid: 1, threadinfo ffff81003f83e000, task ffff81003f840000)
Stack: 0000000000000008 ffff81003f83fbf6 ffff81003ea53a30 0000000000000008
ffff81003f83fc10 ffffffff80495ab4 0000000000000011 0000000000000002
0000000000000202 0000000000000202 00000000fffffff4 ffff81003ea53a30
Call Trace:
[<ffffffff80495ab4>] pcie_isr+0x18e/0x1bc
[<ffffffff80260831>] request_irq+0x106/0x12f
[<ffffffff80495fb6>] pcie_init+0x15e/0x6cc
[<ffffffff804933a3>] pciehp_probe+0x64/0x541
[<ffffffff8048f4e7>] pcie_port_probe_service+0x4c/0x76
[<ffffffff8054af70>] driver_probe_device+0xd4/0x1f0
[<ffffffff8054b108>] __driver_attach+0x7c/0x7e
[<ffffffff8054b08c>] ? __driver_attach+0x0/0x7e
[<ffffffff8054a4b6>] bus_for_each_dev+0x53/0x7d
[<ffffffff8054ad3c>] driver_attach+0x1c/0x1e
[<ffffffff8054a9c2>] bus_add_driver+0xdd/0x25b
[<ffffffff80c09d3d>] ? pcied_init+0x0/0x8b
[<ffffffff8054b288>] driver_register+0x5f/0x13e
[<ffffffff80c09d3d>] ? pcied_init+0x0/0x8b
[<ffffffff8048f441>] pcie_port_service_register+0x47/0x49
[<ffffffff80c09d52>] pcied_init+0x15/0x8b
[<ffffffff80bf3938>] kernel_init+0x75/0x243
[<ffffffff808639d2>] ? _spin_unlock_irq+0x2b/0x3a
[<ffffffff80228d1f>] ? finish_task_switch+0x57/0x9a
[<ffffffff8020c258>] child_rip+0xa/0x12
[<ffffffff8020bcec>] ? restore_args+0x0/0x30
[<ffffffff80bf38c3>] ? kernel_init+0x0/0x243
[<ffffffff8020c24e>] ? child_rip+0x0/0x12
Code: 83 80 00 00 00 48 39 f0 75 e1 0f b6 c9 48 c7 c2 00 0e 8d 80 48 c7 c6 8a 60 a6 80 48 c7 c7 10 db a8 80 31 c0 e8 3f 8d d9 ff 31 db <48> 8b 43 70 48 8d 75 ef 48 89 df ff 50 30 80 7d ef 00 74 37 48
RIP [<ffffffff80494a8b>] pciehp_handle_presence_change+0x7e/0x113
RSP <ffff81003f83fbb0>
CR2: 0000000000000070
Kernel panic - not syncing: Fatal exception
The situation under which it occurs is hw and timing related: it appears
to happen on a system that has PCI hotplug hardware but with no active
hotplug cards, and another interrupt in the same (shared) IRQ line
arrives too early, before the hotplug-slot entry has been set up - as
triggered by CONFIG_DEBUG_SHIRQ=y:
This patch contains the following two fixes.
(1) Clear all events bits in Slot Status register to prevent the pciehp
driver from detecting the spurious events that would have been occur
before pciehp loading.
(2) Add check whether slot initialization had been already done.
This is short term fix. We need more structural fixes to install
interrupt handler after slot initialization is done.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit b3bd307c628af2f0a581c42d5d7e4bcdbbf64b6a
Author: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Date: Tue May 27 19:08:23 2008 +0900
shpchp: add message about shpchp_slot_with_bus option
Some (broken?) platform assign the same slot name to multiple hotplug
slots. On such system, slot initialization would fail because of name
collision. The shpchp driver already have a "slot_with_bus" module
option which adds the bus number into the slot name. This patch adds
the message about this module option that will be displayed when slot
name collision is detected.
Signed-off-by: Kenji Kaneshige <kaneshige.kenji at jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi at intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit 732bee4c859012edf05f3e09b53b68fc332a369d
Author: Olof Johansson <olof at lixom.net>
Date: Tue May 27 16:11:13 2008 -0500
[POWERPC] pasemi: update pasemi_defconfig, enable electra_cf
Refresh pasemi_defconfig and enable ELECTRA_CF=y.
Signed-off-by: Olof Johansson <olof at lixom.net>
commit c433a1b6426880d3e23267938c3542706f3d03a6
Author: Olof Johansson <olof at lixom.net>
Date: Tue May 27 16:07:26 2008 -0500
electra_cf: Add MODULE_DEVICE_TABLE()
Add a module device table to electra_cf so that modules can be
auto-probed/loaded.
Signed-off-by: Olof Johansson <olof at lixom.net>
commit 4dcc29e1574d88f4465ba865ed82800032f76418
Author: Tony Luck <tony.luck at intel.com>
Date: Tue May 27 13:23:16 2008 -0700
[IA64] Workaround for RSE issue
Problem: An application violating the architectural rules regarding
operation dependencies and having specific Register Stack Engine (RSE)
state at the time of the violation, may result in an illegal operation
fault and invalid RSE state. Such faults may initiate a cascade of
repeated illegal operation faults within OS interruption handlers.
The specific behavior is OS dependent.
Implication: An application causing an illegal operation fault with
specific RSE state may result in a series of illegal operation faults
and an eventual OS stack overflow condition.
Workaround: OS interruption handlers that switch to kernel backing
store implement a check for invalid RSE state to avoid the series
of illegal operation faults.
The core of the workaround is the RSE_WORKAROUND code sequence
inserted into each invocation of the SAVE_MIN_WITH_COVER and
SAVE_MIN_WITH_COVER_R19 macros. This sequence includes hard-coded
constants that depend on the number of stacked physical registers
being 96. The rest of this patch consists of code to disable this
workaround should this not be the case (with the presumption that
if a future Itanium processor increases the number of registers, it
would also remove the need for this patch).
Move the start of the RBS up to a mod32 boundary to avoid some
corner cases.
The dispatch_illegal_op_fault code outgrew the spot it was
squatting in when built with this patch and CONFIG_VIRT_CPU_ACCOUNTING=y
Move it out to the end of the ivt.
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit ca61668b82a902143997794aae3f681a602e6ebc
Author: Brian King <brking at linux.vnet.ibm.com>
Date: Mon May 19 10:27:56 2008 -0500
[SCSI] ibmvscsi: Non SCSI error status fixup
Some versions of the Virtual I/O Server on Power
return 0x99 in the non-SCSI error status field as success,
rather than 0. This fixes the ibmvscsi driver to treat this
response as success.
Signed-off-by: Brian King <brking at linux.vnet.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 7ba2db5f38955907e46a65c9334d287cd3da32c2
Author: Michael Reed <mdr at sgi.com>
Date: Thu Mar 13 14:53:56 2008 -0500
[SCSI] fusion mpt: fix target missing after resetting external raid
Following a hard reset of a SAS raid, one of the raid targets is occasionally
missing. I tracked this down to a pretty obscure little bug.
The LSI fusion drivers for SAS and Fibre Channel both use their respective
transport layers. Those transport layers increment the target number
assigned to new targets.
The routine __scsi_scan_target uses the "this_id" element of the Scsi_Host
structure to avoid scanning the scsi host adapter. Both fusion drivers set
"this_id" from a value returned in a firmware PortFacts response. For my
particular test case (SAS) the firmware id assigned to the initiator was
173. After enough raid resets to cause the raid targets to go and come a
sufficient number of times, the id assigned by the transport to a raid
target would match the id assigned by the host adapter to the "this_id"
field, resulting in that target not being scanned.
Fix by not assigning this_id and not checking it in slave_configure.
Signed-off-by: Michael Reed <mdr at sgi.com>
Acked-by: "Moore, Eric" <Eric.Moore at lsi.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 3dbfd0801bbbaf2800d7497d83d743a614430e82
Merge: edb2301f2903e96beadc333f9584222c05858518 f04d264afc51acdffeba9cdf3baf04116687680c
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue May 27 08:27:20 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
avr32: Fix cpufreq oops when ondemand governor is default
avr32: Update defconfigs
avr32: export strnlen_user
avr32: export copy_page
commit edb2301f2903e96beadc333f9584222c05858518
Author: David Woodhouse <dwmw2 at infradead.org>
Date: Tue May 27 06:31:43 2008 +0100
ck804rom: fix driver_data in probe table.
There's a reason why using C99 initialisers even in the supposedly
trivial structs is a good idea.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 825de27d9e40b3117b29a79d412b7a4b78c5d815
Author: Gerrit Renker <gerrit at erg.abdn.ac.uk>
Date: Tue May 27 06:33:54 2008 -0700
dccp ccid-3: Fix "t_ipi explosion" bug
The identification of this bug is thanks to Cheng Wei and Tomasz
Grobelny.
To avoid divide-by-zero, the implementation previously ignored RTTs
smaller than 4 microseconds when performing integer division RTT/4.
When the RTT reached a value less than 4 microseconds (as observed on
loopback), this prevented the Window Counter CCVal value from
advancing. As a result, the receiver stopped sending feedback. This in
turn caused non-ending expiries of the nofeedback timer at the sender,
so that the sending rate was progressively reduced until reaching the
minimum of one packet per 64 seconds.
The patch fixes this bug by handling integer division more
intelligently. Due to consistent use of dccp_sample_rtt(),
divide-by-zero-RTT is avoided.
Signed-off-by: Gerrit Renker <gerrit at erg.abdn.ac.uk>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 6079a463cf95fafcc704a4e5e92a4da12444bd3c
Author: Wei Yongjun <yjwei at cn.fujitsu.com>
Date: Tue May 27 06:22:38 2008 -0700
dccp: Fix to handle short sequence numbers packet correctly
RFC4340 said:
8.5. Pseudocode
...
If P.type is not Data, Ack, or DataAck and P.X == 0 (the packet
has short sequence numbers), drop packet and return
But DCCP has some mistake to handle short sequence numbers packet, now
it drop packet only if P.type is Data, Ack, or DataAck and P.X == 0.
Signed-off-by: Wei Yongjun <yjwei at cn.fujitsu.com>
Acked-by: Gerrit Renker <gerrit at erg.abdn.ac.uk>
Acked-by: Arnaldo Carvalho de Melo <acme at redhat.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit f04d264afc51acdffeba9cdf3baf04116687680c
Author: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
Date: Tue May 27 09:37:42 2008 +0200
avr32: Fix cpufreq oops when ondemand governor is default
Move the AP7 cpufreq init to late_initcall() so that we don't try to
bring up cpufreq until the governor is ready. x86 also uses
late_initcall() for this.
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
commit 87a54a28970fb6a91de3993120eccc01a0ece732
Author: Huang Weiyi <weiyi.huang at gmail.com>
Date: Tue May 27 01:38:45 2008 -0400
Input: apanel - remove duplicate include
Remove duplicate include file <linux/module.h>.
Signed-off-by: Huang Weiyi <weiyi.huang at gmail.com>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit 43f83a8f9963a11a9c3f41beecc363da21ae3602
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Tue May 27 01:37:26 2008 -0400
Input: wm9713 - support five wire panels
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit 5de4cd431db749bdca58ec88862462729f6159b2
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Tue May 27 01:37:19 2008 -0400
Input: wm97xx-core - fix race on PHY init
The chip phy_init() function must be called before the dig_enable() function
but dig_enable() is called when the device is opened and we only call
phy_init() after having reigstered the device, meaning the two can race.
Fix this by doing the phy_init() before we register the input device.
Thanks to Rodolfo Giometti <giometti at enneenne.com> for the report.
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit ef9db4929a4d9559abf1812fd89cc3b09c56b49b
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Tue May 27 01:37:08 2008 -0400
Input: wm97xx-core - fix driver name
Fix driver name - thanks to Guennadi Liakhovetski <g.liakhovetski at gmx.de> for
reporting this.
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit 6b32ca39d70f5d92f4d450dc54966f20e8b5c1f6
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Tue May 27 01:36:47 2008 -0400
Input: wm97xx-core - report a phys for WM97xx touchscreens
phys is displayed in diagnostic output like that from evbug so ensure
that it is set to something.
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit d35895db7aadc24086b6002101154eec478e9dd6
Author: Bruno Prémont <bonbons at linux-vserver.org>
Date: Tue May 27 01:36:04 2008 -0400
Input: i8042 - make sure Dritek quirk is invoked at resume
Also do not fail i8042 entire initialization if enabling dritek extension
fails.
Signed-off-by: Bruno Prémont <bonbons at linux-vserver.org>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit e490517a039a99d692cb3a5561941b0a5f576172
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon May 26 11:07:53 2008 -0700
Linux 2.6.26-rc4
commit cbaffba12ce08beb3e80bfda148ee0fa14aac188
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Mon May 26 20:55:42 2008 +0400
posix timers: discard SI_TIMER signals on exec
Based on Roland's patch. This approach was suggested by Austin Clements
from the very beginning, and then by Linus.
As Austin pointed out, the execing task can be killed by SI_TIMER signal
because exec flushes the signal handlers, but doesn't discard the pending
signals generated by posix timers. Perhaps not a bug, but people find this
surprising. See http://bugzilla.kernel.org/show_bug.cgi?id=10460
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Austin Clements <amdragon+kernelbugzilla at mit.edu>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c8e85b4f4b9ee23bf0e79bdeb3da274a0f9c663f
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Mon May 26 20:55:42 2008 +0400
posix timers: sigqueue_free: don't free sigqueue if it is queued
Currently sigqueue_free() removes sigqueue from list, but doesn't cancel the
pending signal. This is not consistent, the task should either receive the
"full" signal along with siginfo_t, or it shouldn't receive the signal at all.
Change sigqueue_free() to clear SIGQUEUE_PREALLOC but leave sigqueue on list
if it is queued.
This is a user-visible change. If the signal is blocked, it stays queued
after sys_timer_delete() until unblocked with the "stale" si_code/si_value,
and of course it is still counted wrt RLIMIT_SIGPENDING which also limits
the number of posix timers.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Austin Clements <amdragon+kernelbugzilla at mit.edu>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 84a881657d391121cd88c37f0a312dec3528fa44
Merge: 1434b65731963207a4cc84bd87e6191e34321986 2548baa07ddf37ea8604e9627f042616d1cdc43e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon May 26 10:24:06 2008 -0700
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
i2c: Align i2c_device_id
tuner: Do not alter i2c_client.name
commit 1434b65731963207a4cc84bd87e6191e34321986
Merge: 4934ed888e6fe78d9d339471fb870819da911e8b 76994412f8e824e79a593d6777ec327d85f942b2
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon May 26 10:21:26 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
slub: ksize() abuse checks
slob: Fix to return wrong pointer
commit 4934ed888e6fe78d9d339471fb870819da911e8b
Merge: 0dfdf77ab81040e9e4569c9cdaaae5419d18aaaa 9c28faaab19132b3f029d4ffa9a4dee8a11f0cbb
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon May 26 10:20:40 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.26
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.26:
sh: Drop broken URAM support on SH7723.
sh: update Migo-R defconfig
sh: use sm501 8250 mfd support on r2d boards
sh: add probe support for new sh7723 cut
sh: fix VPU interrupt vector for sh7723
sh: fix USBF resource for sh7722
commit 0dfdf77ab81040e9e4569c9cdaaae5419d18aaaa
Merge: c5e6fd28e5776200a737e9df337a529d36fa9a54 551dec47bb5964478db594385a896eb0d4ab2b0a
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon May 26 10:14:37 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: global_reg_snapshot is not for userspace
commit c5e6fd28e5776200a737e9df337a529d36fa9a54
Merge: b3733034f113a4119f734b84e94180a42c8bc1a1 289c79a4bd350e8a25065102563ad1a183d1b402
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon May 26 10:14:02 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (52 commits)
vlan: Use bitmask of feature flags instead of seperate feature bits
fmvj18x_cs: add NextCom NC5310 rev B support
xirc2ps_cs: re-initialize the multicast address in do_reset
3C509: rx_bytes should not be increased when alloc_skb failed
NETFRONT: Use __skb_queue_purge()
VIRTIO: Use __skb_queue_purge()
phylib: do EXPORT_SYMBOL on get_phy_id
netlink: Fix nla_parse_nested_compat() to call nla_parse() directly
WAN: protect HDLC proto list while insmod/rmmod
drivers/net/fs_enet: remove null pointer dereference
S2io: Version update for napi and MSI-X patches
S2io: Added napi support when MSIX is enabled.
S2io: Move all the transmit completions to a single msi-x (alarm) vector
drivers/net/ehea - remove unnecessary memset after kzalloc
au1000_eth: remove useless check
Blackfin EMAC Driver: Removed duplicated include <linux/ethtool.h>
cpmac bugfixes and enhancements
e1000e: use resource_size_t, not unsigned long, for phys addrs
net/usb: add support for Apple USB Ethernet Adapter
uli526x: add support for netpoll
...
commit 2548baa07ddf37ea8604e9627f042616d1cdc43e
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Mon May 26 16:08:40 2008 +0200
i2c: Align i2c_device_id
Align i2c_device_id.driver_data to 8 bytes to not fail on crossbuilds.
(Added in d2653e92732bd3911feff6bee5e23dbf959381db.)
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit 7271e60a950b3677f136a31e084bc4b0463c7018
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Mon May 26 16:08:40 2008 +0200
tuner: Do not alter i2c_client.name
The tuner driver used to change i2c_client.name for its own needs, but
it really shouldn't, as this field is used by i2c-core to do the
device/driver matching. So, create and use a separate field for the
tuner driver needs.
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit d56acacdcd370c0077821a012607876cb11b1b3b
Author: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
Date: Mon May 26 13:25:05 2008 +0200
avr32: Update defconfigs
Just provide reasonable defaults for the new stuff. Tickless and
hrtimers are turned on for all boards except ATSTK1004.
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
commit 01575995de4289aa73aa7cb22cf8fe0461093589
Author: Adrian Bunk <bunk at kernel.org>
Date: Thu May 22 01:01:38 2008 +0300
avr32: export strnlen_user
This patch fixes the following build error:
<-- snip -->
...
MODPOST 1327 modules
ERROR: "strnlen_user" [drivers/input/misc/uinput.ko] undefined!
...
make[2]: *** [__modpost] Error 1
<-- snip -->
Reported-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
commit a0ed3d8d94b6a28c886cf9c023693afa3bb773f2
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon May 5 21:29:57 2008 +0300
avr32: export copy_page
This patch fixes the following build error:
<-- snip -->
...
MODPOST 61 modules
ERROR: "copy_page" [fs/fuse/fuse.ko] undefined!
...
make[2]: *** [__modpost] Error 1
<-- snip -->
Also add an empty line since *_page aren't "String functions".
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
commit 551dec47bb5964478db594385a896eb0d4ab2b0a
Author: Adrian Bunk <bunk at kernel.org>
Date: Sun May 25 22:50:16 2008 -0700
sparc64: global_reg_snapshot is not for userspace
global_reg_snapshot shouldn't be visible in our userspace headers.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 9c28faaab19132b3f029d4ffa9a4dee8a11f0cbb
Author: Paul Mundt <lethal at linux-sh.org>
Date: Mon May 26 11:45:45 2008 +0900
sh: Drop broken URAM support on SH7723.
This was copied over from the previous MobileR bits, which doesn't
apply to R2. The URAM block on R2 is recycled for the L2 instead.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit b3733034f113a4119f734b84e94180a42c8bc1a1
Merge: c8ff99a7c2fb23a0f1165f3821fd66fd65f30264 73531905ed53576d9e8707659a761e7046a60497
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun May 25 15:00:27 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
Kconfig: introduce ARCH_DEFCONFIG to DEFCONFIG_LIST
.gitignore: match ncscope.out
scripts/ver_linux use 'gcc -dumpversion'
commit c8ff99a7c2fb23a0f1165f3821fd66fd65f30264
Merge: 32522bfdaed094e447f71cce68c349847ae9c7d5 a49056da0325742d3b4f5d1ef7bf8ab0690c3888
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun May 25 14:59:59 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] Add ICH9DO into the iTCO_wdt.c driver
[WATCHDOG] Fix booke_wdt.c on MPC85xx SMP system's
[WATCHDOG] Add a watchdog driver based on the CS5535/CS5536 MFGPT timers
[WATCHDOG] hpwdt: Fix NMI handling.
[WATCHDOG] Blackfin Watchdog Driver: split platform device/driver
[WATCHDOG] Add w83697h_wdt early_disable option
[WATCHDOG] Make w83697h_wdt timeout option string similar to others
[WATCHDOG] Make w83697h_wdt void-like functions void
commit 32522bfdaed094e447f71cce68c349847ae9c7d5
Merge: eb90d81d03c0917b0fd629f6342554a3b58ea52c 587755f1f6a983a9f0f3322d284034f4e146891a
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun May 25 14:59:27 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
[ALSA] hda - Fix capture mute Widget for stac9250/9251
[ALSA] snd-pcsp - fix pcsp_treble_info() to honour an item number
[ALSA] hda - Added support for Foxconn P35AX-S mainboard
[ALSA] hda - Fix COEF and EAPD in ALC889 auto-configuration mode
[ALSA] hda - Fix noise on VT1708 codec
[ALSA] hda - Add model for ASUS P5K-E/WIFI-AP
commit 73531905ed53576d9e8707659a761e7046a60497
Author: Sam Ravnborg <sam at ravnborg.org>
Date: Sun May 25 23:03:18 2008 +0200
Kconfig: introduce ARCH_DEFCONFIG to DEFCONFIG_LIST
init/Kconfig contains a list of configs that are searched
for if 'make *config' are used with no .config present.
Extend this list to look at the config identified by
ARCH_DEFCONFIG.
With this change we now try the defconfig targets last.
This fixes a regression reported
by: Linus Torvalds <torvalds at linux-foundation.org>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Cc: Linus Torvalds <torvalds at linux-foundation.org>
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: Ingo Molnar <mingo at redhat.com>
Cc: "H. Peter Anvin" <hpa at zytor.com>
commit 9723c046bd5989aa9064038ce142f498bb1870d6
Author: Jike Song <albcamus at gmail.com>
Date: Thu May 22 09:23:10 2008 +0800
.gitignore: match ncscope.out
Sometimes I got this:
$ git-status
{snip}
# On branch master
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# ncscope.out
nothing added to commit but untracked files present (use "git add"
to track)
Fix it.
Signed-off-by: Jike Song <albcamus at gmail.com>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit 656a3f797889dafcce2f5b8b222ad66e9974b6f7
Author: Gabriel C <nix.or.die at googlemail.com>
Date: Wed May 21 20:36:19 2008 +0200
scripts/ver_linux use 'gcc -dumpversion'
These magic greps and hacks in ver_linux to get the gcc version always break after some gcc releases.
Since now gcc >4.3 allows compiling with '--with-pkgversion' ( which can be everything 'My Cool Gcc' or something )
ver_linux will report random junk for these.
Simply use 'gcc -dumpversion' to get the gcc version which should always work.
Signed-off-by: Gabriel C <nix.or.die at googlemail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit 587755f1f6a983a9f0f3322d284034f4e146891a
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Sun May 25 18:20:06 2008 +0200
[ALSA] hda - Fix capture mute Widget for stac9250/9251
Fix capture mute widget for STAC9250/9251 codecs. The widget 0x09
has no mute but 0x14 does actually.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 97e08f5d732bbfd5180f73aa7875d328421bee8a
Author: Stas Sergeev <stsp at aknet.ru>
Date: Sat May 24 18:05:47 2008 +0200
[ALSA] snd-pcsp - fix pcsp_treble_info() to honour an item number
This solves the problem with mixers wrongly displaying the PWM freq.
Signed-off-by: Stas Sergeev <stsp at aknet.ru>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit a49056da0325742d3b4f5d1ef7bf8ab0690c3888
Author: Gabriel C <nix.or.die at googlemail.com>
Date: Wed Apr 30 16:51:10 2008 +0200
[WATCHDOG] Add ICH9DO into the iTCO_wdt.c driver
Add the Intel ICH9DO controller ID's for the iTCO_wdt kernel driver and bump
the driver version.
Tested on an P5E-VM DO ASUS motherboard.
Signed-off-by: Gabriel Craciunescu <nix.or.die at googlemail.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
commit f172ddc61ad7a7c444b2b3e08992a45c76b821f9
Author: Chen Gong <g.chen at freescale.com>
Date: Tue Apr 29 16:42:05 2008 +0800
[WATCHDOG] Fix booke_wdt.c on MPC85xx SMP system's
On Book-E SMP systems each core has its own private watchdog. If only one
watchdog is enabled, when the core that doesn't enable the watchdog is hung,
system can't reset because no watchdog is running on it. That's bad. It
means we must enable watchdogs on both cores.
We can use smp_call_function() to send appropriate messages to all the other
cores to enable and update the watchdog.
Signed-off-by: Chen Gong <g.chen at freescale.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
commit 0b36086b5d7c397a128784bed6e332418e500af1
Author: Jordan Crouse <jordan.crouse at amd.com>
Date: Mon Jan 21 10:07:00 2008 -0700
[WATCHDOG] Add a watchdog driver based on the CS5535/CS5536 MFGPT timers
Add a watchdog timer based on the MFGPT timers in the CS5535/CS5536
companion chips to the AMD Geode GX and LX processors. Only caveat
is that the BIOS must provide at least a one free timer, and most
do not.
Signed-off-by: Jordan Crouse <jordan.crouse at amd.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 7f7f894c6d3285407b2493d1575500fb25e3d495
Author: Mingarelli, Thomas <Thomas.Mingarelli at hp.com>
Date: Tue Mar 25 17:17:30 2008 +0000
[WATCHDOG] hpwdt: Fix NMI handling.
I need to just return in case it's not my NMI so someone else can take a look
at it (and reset die_nmi_called to 0 in case I actually do get one that's mine
to handle).
Signed-off-by: Thomas Mingarelli <thomas.mingarelli at hp.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 93539b194696a6291e6895be07d4241c8d972c4b
Author: Mike Frysinger <vapier.adi at gmail.com>
Date: Thu Mar 27 11:53:32 2008 -0700
[WATCHDOG] Blackfin Watchdog Driver: split platform device/driver
- split platform device/driver registering from actual watchdog device/driver
registering so that we can cleanly load/unload
- fixup __initdata with __initconst and __devinitdata with __devinitconst
Signed-off-by: Mike Frysinger <vapier.adi at gmail.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 6fd656012bb8d5c5a4570adc2e630668b0109cb0
Author: Samuel Tardieu <sam at rfc1149.net>
Date: Wed Mar 12 14:28:03 2008 +0100
[WATCHDOG] Add w83697h_wdt early_disable option
Pádraig Brady requested the possibility of not disabling the watchdog
at module load time or kernel boot time if it had been previously enabled
in the bios. It may help rebooting the machine if it freezes before the
userland daemon kicks in.
Signed-off-by: Samuel Tardieu <sam at rfc1149.net>
Cc: Pádraig Brady <P at draigBrady.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 5794a9f412676ee7ec87828a926d0f58f0a2ffbf
Author: Samuel Tardieu <sam at rfc1149.net>
Date: Wed Mar 12 14:28:02 2008 +0100
[WATCHDOG] Make w83697h_wdt timeout option string similar to others
Signed-off-by: Samuel Tardieu <sam at rfc1149.net>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 03315adca76ee93128e4d92566d1f18a1a937e79
Author: Samuel Tardieu <sam at rfc1149.net>
Date: Wed Mar 12 14:28:01 2008 +0100
[WATCHDOG] Make w83697h_wdt void-like functions void
Some non-exported functions always returned 0. Mark them void instead.
Signed-off-by: Samuel Tardieu <sam at rfc1149.net>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit eb90d81d03c0917b0fd629f6342554a3b58ea52c
Merge: d3c5f8b93febadf62da9a4b39a2dca8e66a4da40 b1979a5fda7869a790f4fd83fb06c78498d26ba1
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat May 24 10:20:00 2008 -0700
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip:
x86: prevent PGE flush from interruption/preemption
x86: use explicit copy in vdso_gettimeofday()
namespacecheck: automated fixes
x86/xen: fix arbitrary_virt_to_machine()
x86: don't read maxlvt before checking if APIC is mapped
x86: disable TSC for sched_clock() when calibration failed
x86: distangle user disabled TSC from unstable
x86: fix setup of cyc2ns in tsc_64.c
commit d3c5f8b93febadf62da9a4b39a2dca8e66a4da40
Merge: 25d5cb4b0375e5864ec0ccf35e12ff1d1b5cf3f0 7c28472a5d4ecf7c61b3c3901994be878cd6c5d2
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat May 24 10:13:16 2008 -0700
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] integrator: fix build warnings and errors
[ARM] fix OMAP include loops
Revert "[ARM] pxa: spitz wants PXA27x UDC definitions"
[ARM] 5053/1: define before use of processor_id
[ARM] 5052/1: export clock functions for the at91x40
[ARM] 5051/1: define pgtable_t for the !CONFIG_MMU case too
[ARM] omap: fix omap clk support build errors
[ARM] 5039/1: S3C244X: Rename SDI device if running on S3C244X.
[ARM] 5043/1: pxafb: remove unused mode variable in pxafb_init_fbinfo
[ARM] 5041/1: VR1000: Fix DM9000 IRQ flags initialisation
[ARM] 5040/1: BAST: Fix DM9000 IRQ flags initialisation
[ARM] 5038/1: ARM: OMAP: Remove tsc2102 references from board-palmte.c
[ARM] 5025/2: fix collie cpu initialisation
commit 25d5cb4b0375e5864ec0ccf35e12ff1d1b5cf3f0
Author: David Brownell <david-b at pacbell.net>
Date: Fri May 23 13:05:03 2008 -0700
spi: remove some spidev oops-on-rmmod paths
Somehow the spidev code forgot to include a critical mechanism: when the
underlying device is removed (e.g. spi_master rmmod), open file
descriptors must be prevented from issuing new I/O requests to that
device. On penalty of the oopsing reported by Sebastian Siewior
<bigeasy at tglx.de> ...
This is a partial fix, adding handshaking between the lower level (SPI
messaging) and the file operations using the spi_dev. (It also fixes an
issue where reads and writes didn't return the number of bytes sent or
received.)
There's still a refcounting issue to be addressed (separately).
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Reported-by: Sebastian Siewior <bigeasy at tglx.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5c02b575780d0d785815a1e7b79a98edddee895a
Author: Cedric Le Goater <clg at fr.ibm.com>
Date: Fri May 23 13:05:02 2008 -0700
cgroups: remove node_ prefix_from ns subsystem
This is a slight change in the namespace cgroup subsystem api.
The change is that previously when cgroup_clone() was called (currently
only from the unshare path in ns_proxy cgroup, you'd get a new group named
"node_$pid" whereas now you'll get a group named after just your pid.)
The only users who would notice it are those who are using the ns_proxy
cgroup subsystem to auto-create cgroups when namespaces are unshared -
something of an experimental feature, which I think really needs more
complete container/namespace support in order to be useful. I suspect the
only users are Cedric and Serge, or maybe a few others on
containers at lists.linux-foundation.org. And in fact it would only be
noticed by the users who make the assumption about how the name is
generated, rather than getting it from the /proc/<pid>/cgroups file for
the process in question.
Whether the change is actually needed or not I'm fairly agnostic on, but I
guess it is more elegant to just use the pid as the new group name rather
than adding a fairly arbitrary "node_" prefix on the front.
[menage at google.com: provided changelog]
Signed-off-by: Cedric Le Goater <clg at fr.ibm.com>
Cc: "Paul Menage" <menage at google.com>
Cc: "Serge E. Hallyn" <serue at us.ibm.com>
Cc: <stable at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 12d15f0d51d47cec39d1d7250e81573c5cbd8b5d
Author: Fernando Luis Vazquez Cao <fernando at oss.ntt.co.jp>
Date: Fri May 23 13:05:01 2008 -0700
for_each_online_pgdat(): kerneldoc fix
for_each_pgdat() was renamed to for_each_online_pgdat() and kerneldoc
comments should be updated accordingly.
Signed-off-by: Fernando Luis Vazquez Cao <fernando at oss.ntt.co.jp>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit fb56f0f9922d3fb2c5503cdc346dc3f86c897bc4
Author: Adrian Bunk <bunk at kernel.org>
Date: Fri May 23 13:05:00 2008 -0700
frv: export empty_zero_page
Fix the following build error:
ERROR: "empty_zero_page" [fs/ext4/ext4dev.ko] undefined!
Reported-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Cc: David Howells <dhowells at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7b26655f6208fdefa9ab0adc016116324f8d4ba8
Author: Shi Weihua <shiwh at cn.fujitsu.com>
Date: Fri May 23 13:04:59 2008 -0700
sys_prctl(): fix return of uninitialized value
If none of the switch cases match, the PR_SET_PDEATHSIG and
PR_SET_DUMPABLE cases of the switch statement will never write to local
variable `error'.
Signed-off-by: Shi Weihua <shiwh at cn.fujitsu.com>
Cc: Andrew G. Morgan <morgan at kernel.org>
Acked-by: "Serge E. Hallyn" <serue at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f99c90094bffbe1cf38ef66f198a808c14a02d56
Author: Kumar Gala <galak at kernel.crashing.org>
Date: Fri May 23 13:04:58 2008 -0700
edac: mpc85xx: fix building as a module
including of <asm/mpc85xx.h> causes build problems since it doesn't exist.
Also removed warning:
drivers/edac/mpc85xx_edac.c:45: warning: 'mpc85xx_ctl_name' defined but not used
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
Acked-by: Doug Thompson <dougthompson at xmission.com>
Acked-by: Dave Jiang <djiang at mvista.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6ea0205b56546cef782b74d9f4664ec00290a6ae
Author: David Brownell <david-b at pacbell.net>
Date: Fri May 23 13:04:58 2008 -0700
gpio: build fixes
This fixes various gpio-related build errors (mostly potential)
reported in part by Russell King and Uwe Kleine-König.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Cc: Uwe Kleine-König <Uwe.Kleine-Koenig at digi.com>
Cc: Russell King <rmk at arm.linux.org.uk>
Cc: Arnaud Patard <arnaud.patard at rtp-net.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ee29420aca6ca6fbb3e72ee8a980b2600911b864
Author: Ben Dooks <ben-fbdev at fluff.org>
Date: Fri May 23 13:04:57 2008 -0700
S3C2410: fix driver MODULE_ALIAS()
Add a correct MODULE_ALIAS() entry for this driver to enable udev module
loading.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Cc: Arnaud Patard <arnaud.patard at rtp-net.org>
Acked-by: Krzysztof Helt <krzysztof.h1 at wp.pl>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6a0e4ec7bcc6e80d2a32a4c0b83a32c904aadc05
Author: Ben Dooks <ben-fbdev at fluff.org>
Date: Fri May 23 13:04:56 2008 -0700
S3C2410: clean out changelog header and tidy
Remove the old changelog entries which are now out of date and should be
extractable from git anyway. Also tidy up the copyright for the driver.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Cc: Arnaud Patard <arnaud.patard at rtp-net.org>
Acked-by: Krzysztof Helt <krzysztof.h1 at wp.pl>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d585dfe840c93ea800afc124333b6ac04722d359
Author: Ben Dooks <ben-fbdev at fluff.org>
Date: Fri May 23 13:04:56 2008 -0700
S3C2410: add error print if we cannot add attribute
Fix the following warning by checking the result of device_create_file and
printing an error but not removing the device (loss of debug registers is
not fatal).
drivers/video/s3c2410fb.c:905: warning: ignoring return value of 'device_create_file', declared with attribute warn_unused_result
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Cc: Arnaud Patard <arnaud.patard at rtp-net.org>
Acked-by: Krzysztof Helt <krzysztof.h1 at wp.pl>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 673b4600e3b3cc6689025e6a6fc6909b6e53dd5e
Author: Ben Dooks <ben-fbdev at fluff.org>
Date: Fri May 23 13:04:55 2008 -0700
S3C2410: ensure that FB_BLANK_POWERDOWN shuts down the controller
When a blank level of FB_BLANK_POWERDOWN is used, we should shut down the
controller so that it no longer tries to produce any panel signals or
data, and shuts down the DMA which is not needed.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Cc: Arnaud Patard <arnaud.patard at rtp-net.org>
Acked-by: Krzysztof Helt <krzysztof.h1 at wp.pl>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cdc83ae2453ddb19060e05e6afd22b1254128c42
Author: Ben Dooks <ben-fbdev at fluff.org>
Date: Fri May 23 13:04:53 2008 -0700
SM501: reverse FPEN/VBIASEN flags behaviour
To keep backwards compatibility, reverse the meanings of these flags so
that when they are not set, the driver uses the original behvaiour.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Cc: Arnaud Patard <arnaud.patard at rtp-net.org>
Acked-by: Krzysztof Helt <krzysztof.h1 at wp.pl>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cd94b9dbfa300fc42e45f230010623fc08d59563
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Fri May 23 13:04:52 2008 -0700
memory hotplug: fix early allocation handling
Trying to add memory via add_memory() from within an initcall function
results in
bootmem alloc of 163840 bytes failed!
Kernel panic - not syncing: Out of memory
This is caused by zone_wait_table_init() which uses system_state to decide
if it should use the bootmem allocator or not.
When initcalls are handled the system_state is still SYSTEM_BOOTING but
the bootmem allocator doesn't work anymore. So the allocation will fail.
To fix this use slab_is_available() instead as indicator like we do it
everywhere else.
[akpm at linux-foundation.org: coding-style fix]
Reviewed-by: Andy Whitcroft <apw at shadowen.org>
Cc: Dave Hansen <haveblue at us.ibm.com>
Cc: Gerald Schaefer <gerald.schaefer at de.ibm.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Acked-by: Yasunori Goto <y-goto at jp.fujitsu.com>
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7eb54824b76793dd86afb54f182ef9aa64b3a45a
Author: Andy Whitcroft <apw at shadowen.org>
Date: Fri May 23 13:04:50 2008 -0700
zonelists: handle a node zonelist with no applicable entries
When booting 2.6.26-rc3 on a multi-node x86_32 numa system we are seeing
panics when trying node local allocations:
BUG: unable to handle kernel NULL pointer dereference at 0000034c
IP: [<c1042507>] get_page_from_freelist+0x4a/0x18e
*pdpt = 00000000013a7001 *pde = 0000000000000000
Oops: 0000 [#1] SMP
Modules linked in:
Pid: 0, comm: swapper Not tainted (2.6.26-rc3-00003-g5abc28d #82)
EIP: 0060:[<c1042507>] EFLAGS: 00010282 CPU: 0
EIP is at get_page_from_freelist+0x4a/0x18e
EAX: c1371ed8 EBX: 00000000 ECX: 00000000 EDX: 00000000
ESI: f7801180 EDI: 00000000 EBP: 00000000 ESP: c1371ec0
DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068
Process swapper (pid: 0, ti=c1370000 task=c12f5b40 task.ti=c1370000)
Stack: 00000000 00000000 00000000 00000000 000612d0 000412d0 00000000 000412d0
f7801180 f7c0101c f7c01018 c10426e4 f7c01018 00000001 00000044 00000000
00000001 c12f5b40 00000001 00000010 00000000 000412d0 00000286 000412d0
Call Trace:
[<c10426e4>] __alloc_pages_internal+0x99/0x378
[<c10429ca>] __alloc_pages+0x7/0x9
[<c105e0e8>] kmem_getpages+0x66/0xef
[<c105ec55>] cache_grow+0x8f/0x123
[<c105f117>] ____cache_alloc_node+0xb9/0xe4
[<c105f427>] kmem_cache_alloc_node+0x92/0xd2
[<c122118c>] setup_cpu_cache+0xaf/0x177
[<c105e6ca>] kmem_cache_create+0x2c8/0x353
[<c13853af>] kmem_cache_init+0x1ce/0x3ad
[<c13755c5>] start_kernel+0x178/0x1ee
This occurs when we are scanning the zonelists looking for a ZONE_NORMAL
page. In this system there is only ZONE_DMA and ZONE_NORMAL memory on
node 0, all other nodes are mapped above 4GB physical. Here is a dump
of the zonelists from this system:
zonelists pgdat=c1400000
0: c14006c0:2 f7c006c0:2 f7e006c0:2 c1400360:1 c1400000:0
1: c14006c0:2 c1400360:1 c1400000:0
zonelists pgdat=f7c00000
0: f7c006c0:2 f7e006c0:2 c14006c0:2 c1400360:1 c1400000:0
1: f7c006c0:2
zonelists pgdat=f7e00000
0: f7e006c0:2 c14006c0:2 f7c006c0:2 c1400360:1 c1400000:0
1: f7e006c0:2
When performing a node local allocation we call get_page_from_freelist()
looking for a page. It in turn calls first_zones_zonelist() which returns
a preferred_zone. Where there are no applicable zones this will be NULL.
However we use this unconditionally, leading to this panic.
Where there are no applicable zones there is no possibility of a successful
allocation, so simply fail the allocation.
Signed-off-by: Andy Whitcroft <apw at shadowen.org>
Acked-by: Mel Gorman <mel at csn.ul.ie>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 03a74dcc7eebe6edd778317e82fafdf71e68488c
Author: Arjan van de Ven <arjan at linux.intel.com>
Date: Fri May 23 13:04:49 2008 -0700
serial: fix enable_irq_wake/disable_irq_wake imbalance in serial_core.c
enable_irq_wake() and disable_irq_wake() need to be balanced. However,
serial_core.c calls these for different conditions during the suspend and
resume functions...
This is causing a regular WARN_ON() as found at
http://www.kerneloops.org/search.php?search=set_irq_wake
This patch makes the conditions for triggering the _wake enable/disable
sequence identical.
Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c4185a0e019387f5ad6e99009804965531fa1fab
Author: Denis V. Lunev <den at openvz.org>
Date: Fri May 23 13:04:47 2008 -0700
proc: proc_get_inode() should get module only once
Any file under /proc/net opened more than once leaked the refcounter
on the module it belongs to.
The problem is that module_get is called for each file opening while
module_put is called only when /proc inode is destroyed. So, lets put
module counter if we are dealing with already initialised inode.
Addresses http://bugzilla.kernel.org/show_bug.cgi?id=10737
Signed-off-by: Denis V. Lunev <den at openvz.org>
Cc: David Miller <davem at davemloft.net>
Cc: Patrick McHardy <kaber at trash.net>
Acked-by: Pavel Emelyanov <xemul at openvz.org>
Acked-by: Robert Olsson <robert.olsson at its.uu.se>
Acked-by: Eric W. Biederman <ebiederm at xmission.com>
Reported-by: Roland Kletzing <devzero at web.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 53978d0a7a27eb036b9bf33c4caa06257a9dbed7
Author: Marcin Krol <hawk at pld-linux.org>
Date: Fri May 23 13:04:46 2008 -0700
brd: don't show ramdisks in /proc/partitions
In 2.6.25, ramdisk devices show up in /proc/partitions, which is a
behaviour change from the old rd.c. Add GENHD_FL_SUPPRESS_PARTITION_INFO,
which was present in rd.c.
All kernels prior to 2.6.25 weren't displaying ramdisks in
/proc/partitions. Since there are many userspace tools using information
from /proc/partitions some of them may now behave incorrectly (I didn't
tested any though). For example before 2.6.25 /proc/partitions was empty
if no block devices like hard disks and such were detected by kernel. Now
all 16 ramdisks are always visible there. Some software may rely on such
information (I mean, on empty /proc/partitions).
There was quite similar situation back in 2004, and ramdisks were excluded
back from displaying. Thats why I called this a regression (maybe a bit
unfortunate). See this patch for info:
http://kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.3-rc2/2.6.3-rc2-mm1/broken-out/nbd-proc-partitions-fix.patch
I also think that someone somewhere (long time ago) excluded ramdisks from
/proc/partitions for good reasons. It is possible that now such new
"feature" is harmless, but I think there are more chances that someone
will say "hey, /proc/partitions has changed, now my software doesn't work"
then "hey where did my new 2.6.25 feature go". nbd devices are also
excluded, maybe for very same (unknown to me) reasons.
Signed-off-by: Marcin Krol <hawk at pld-linux.org>
Signed-off-by: Nick Piggin <npiggin at suse.de>
Cc: <stable at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6089093e588ee3f6aed99d08b1cf5ea37c52cf97
Author: Alan Cox <alan at redhat.com>
Date: Fri May 23 13:04:45 2008 -0700
ip2: fix crashes on load/unload
This doesn't need to be two modules, and making it one cleans up the
problem
Signed-off-by: Alan Cox <alan at redhat.com>
Cc: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit bff5fda972dc23bd1806a47c2098ae173585d013
Author: Trent Piepho <xyzzy at speakeasy.org>
Date: Fri May 23 13:04:44 2008 -0700
gpiolib: fix off by one errors
The last gpio belonging to a chip is chip->base + chip->ngpios - 1. Some
places in the code, but not all, forgot the critical minus one.
Signed-off-by: Trent Piepho <xyzzy at speakeasy.org>
Acked-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1d1c1d9b557a12320174058d2d313ffb0f8611f4
Author: Roel Kluin <12o3l at tiscali.nl>
Date: Fri May 23 13:04:43 2008 -0700
gpio: mcp23s08 debug fix
The return value of mcp23s08_read_regs() can only be evaluated when signed
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 69292b342193d4068f6435660368ff98713d8164
Author: David Brownell <david-b at pacbell.net>
Date: Fri May 23 13:04:42 2008 -0700
gpio: pca953x driver handles pca9554 too
Teach drivers/gpio/pca953x.c about PCA9554, another compatible chip.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit da7978b0348d497688541e2d2f5739aa2a2c334f
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Fri May 23 13:04:41 2008 -0700
signals: fix sigqueue_free() vs __exit_signal() race
__exit_signal() does flush_sigqueue(tsk->pending) outside of ->siglock.
This can race with another thread doing sigqueue_free(), we can free the
same SIGQUEUE_PREALLOC sigqueue twice or corrupt the pending->list.
Note that even sys_exit_group() can trigger this race, not only
sys_timer_delete().
Move the callsite of flush_sigqueue(tsk->pending) under ->siglock.
This patch doesn't touch flush_sigqueue(->shared_pending) below, it is
called when there are no other threads which can play with signals, and
sigqueue_free() can't be used outside of our thread group.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Acked-by: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit dfc7064500061677720fa26352963c772d3ebe6b
Author: NeilBrown <neilb at suse.de>
Date: Fri May 23 13:04:39 2008 -0700
md: restart recovery cleanly after device failure.
When we get any IO error during a recovery (rebuilding a spare), we abort
the recovery and restart it.
For RAID6 (and multi-drive RAID1) it may not be best to restart at the
beginning: when multiple failures can be tolerated, the recovery may be
able to continue and re-doing all that has already been done doesn't make
sense.
We already have the infrastructure to record where a recovery is up to
and restart from there, but it is not being used properly.
This is because:
- We sometimes abort with MD_RECOVERY_ERR rather than just MD_RECOVERY_INTR,
which causes the recovery not be be checkpointed.
- We remove spares and then re-added them which loses important state
information.
The distinction between MD_RECOVERY_ERR and MD_RECOVERY_INTR really isn't
needed. If there is an error, the relevant drive will be marked as
Faulty, and that is enough to ensure correct handling of the error. So we
first remove MD_RECOVERY_ERR, changing some of the uses of it to
MD_RECOVERY_INTR.
Then we cause the attempt to remove a non-faulty device from an array to
fail (unless recovery is impossible as the array is too degraded). Then
when remove_and_add_spares attempts to remove the devices on which
recovery can continue, it will fail, they will remain in place, and
recovery will continue on them as desired.
Issue: If we are halfway through rebuilding a spare and another drive
fails, and a new spare is immediately available, do we want to:
1/ complete the current rebuild, then go back and rebuild the new spare or
2/ restart the rebuild from the start and rebuild both devices in
parallel.
Both options can be argued for. The code currently takes option 2 as
a/ this requires least code change
b/ this results in a minimally-degraded array in minimal time.
Cc: "Eivind Sarto" <ivan at kasenna.com>
Signed-off-by: Neil Brown <neilb at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 90b08710e41a07d4ff0fb8940dcce3a552991a56
Author: Bernd Schubert <bs at q-leap.de>
Date: Fri May 23 13:04:38 2008 -0700
md: allow parallel resync of md-devices.
In some configurations, a raid6 resync can be limited by CPU speed
(Calculating P and Q and moving data) rather than by device speed. In
these cases there is nothing to be gained byt serialising resync of arrays
that share a device, and doing the resync in parallel can provide benefit.
So add a sysfs tunable to flag an array as being allowed to resync in
parallel with other arrays that use (a different part of) the same device.
Signed-off-by: Bernd Schubert <bs at q-leap.de>
Signed-off-by: Neil Brown <neilb at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4f54b0e9485644a3c5fca2ae43bcbe7376825747
Author: Dan Williams <dan.j.williams at intel.com>
Date: Fri May 23 13:04:37 2008 -0700
md: notify userspace on 'stop' events
This additional notification to 'array_state' is needed to allow the
monitor application to learn about stop events via sysfs. The
sysfs_notify("sync_action") call that comes at the end of do_md_stop()
(via md_new_event) is insufficient since the 'sync_action' attribute has
been removed by this point.
(Seems like a sysfs-notify-on-removal patch is a better fix. Currently
removal updates the event count but does not wake up waiters)
Signed-off-by: Dan Williams <dan.j.williams at intel.com>
Signed-off-by: Neil Brown <neilb at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 09a44cc15079f80c1416cde1a1d5b2cdd8f2118a
Author: NeilBrown <neilb at suse.de>
Date: Fri May 23 13:04:36 2008 -0700
md: notify userspace on 'write-pending' changes to array_state
When an array enters write pending, 'array_state' changes, so we must be
sure to sysfs_notify.
Also, when waiting for user-space to acknowledge 'write-pending' by
marking the metadata as dirty, we don't want to wait for MD_CHANGE_DEVS to
be cleared as that might not happen. So explicity test for the bits that
we are really interested in.
Signed-off-by: Neil Brown <neilb at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 698b18c1e8bddf39cbf1ba50792b0fe302dbe6d6
Author: NeilBrown <neilb at suse.de>
Date: Fri May 23 13:04:35 2008 -0700
md: raid1: Fix restoration of bio between failed read and write.
When performing a "recovery" or "check" pass on a RAID1 array, we read
from each device and possible, if there is a difference or a read error,
write back to some devices.
We use the same 'bio' for both read and write, resetting various fields
between the two operations.
We forgot to reset bv_offset and bv_len however. These are often left
unchanged, but in the case where there is an IO error one or two sectors
into a page, they are changed.
This results in correctable errors not being corrected properly. It does
not result in any data corruption.
Cc: "Fairbanks, David" <David.Fairbanks at stratus.com>
Signed-off-by: Neil Brown <neilb at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6be9d4940134b36f9ed020aead36f831f19b49f1
Author: Bernd Schubert <bernd-schubert at gmx.de>
Date: Fri May 23 13:04:34 2008 -0700
md: md: raid5 rate limit error printk
Last night we had scsi problems and a hardware raid unit was offlined
during heavy i/o. While this happened we got for about 3 minutes a huge
number messages like these
Apr 12 03:36:07 pfs1n14 kernel: [197510.696595] raid5:md7: read error not correctable (sector 2993096568 on sdj2).
I guess the high error rate is responsible for not scheduling other events
- during this time the system was not pingable and in the end also other
devices run into scsi command timeouts causing problems on these unrelated
devices as well.
Signed-off-by: Bernd Schubert <bernd-schubert at gmx.de>
Signed-off-by: Dan Williams <dan.j.williams at intel.com>
Signed-off-by: Neil Brown <neilb at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6bcfd601861cce45ca73ac1d714f1286b6b3f0d4
Author: Christoph Hellwig <hch at lst.de>
Date: Fri May 23 13:04:34 2008 -0700
md: kill file_path wrapper
Kill the trivial and rather pointless file_path wrapper around d_path.
Signed-off-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Neil Brown <neilb at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 03de250a269bfa8e6a9e6ccb4a1dbce19dae8a61
Author: Adrian Bunk <bunk at kernel.org>
Date: Fri May 23 13:04:33 2008 -0700
md: proper extern for mdp_major
This patch adds a proper extern for mdp_major in include/linux/raid/md.h
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Neil Brown <neilb at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 84255d1018c50e72c71a49f359989597d53a3f53
Author: NeilBrown <neilb at suse.de>
Date: Fri May 23 13:04:32 2008 -0700
md: fix possible oops when removing a bitmap from an active array
It is possible to add a write-intent bitmap to an active array, or remove
the bitmap that is there.
When we do with the 'quiesce' the array, which causes make_request to
block in "wait_barrier()".
However we are sampling the value of "mddev->bitmap" before the
wait_barrier call, and using it afterwards. This can result in using a
bitmap structure that has been freed.
Signed-off-by: Neil Brown <neilb at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 80119ef5c8153e0a6cc5edf00c083dc98a9bd348
Author: Alan Cox <alan at redhat.com>
Date: Fri May 23 13:04:31 2008 -0700
mm: fix atomic_t overflow in vm
The atomic_t type is 32bit but a 64bit system can have more than 2^32
pages of virtual address space available. Without this we overflow on
ludicrously large mappings
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6c7c6afbb8c0e60d32a563cae7c6889211e9d9d8
Author: maximilian attems <max at stro.at>
Date: Fri May 23 13:04:29 2008 -0700
types.h: don't expose struct ustat to userspace
<linux/types.h> can't be used together with <sys/ustat.h> because they
both define struct ustat:
$ cat test.c
#include <sys/ustat.h>
#include <linux/types.h>
$ gcc -c test.c
In file included from test.c:2:
/usr/include/linux/types.h:165: error: redefinition of 'struct ustat'
has been reported a while ago to debian, but seems to have been
lost in cat fighting: http://bugs.debian.org/429064
Signed-off-by: maximilian attems <max at stro.at>
Cc: <stable at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4b6f6ce97ecc20eb8f3ece3c8370faacfe73e8c2
Author: Ignacio GarcÃa Pérez <iggarpe at t2i.com>
Date: Fri May 23 13:04:28 2008 -0700
serial: support for InstaShield IS-400 four port RS-232 PCI card
Add support for the InstaShield IS-400 four port RS-232 PCI card.
Signed-off-by: Ignacio GarcÃa Pérez <iggarpe at t2i.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 25829b0e977a7e396b284dad0f523099394390e7
Author: Mariusz Kozlowski <m.kozlowski at tuxland.pl>
Date: Fri May 23 13:04:28 2008 -0700
fix parenthesis in include/asm-mips/mach-au1x00/au1000.h
Parenthesis fix in include/asm-mips/mach-au1x00/au1000.h
Signed-off-by: Mariusz Kozlowski <m.kozlowski at tuxland.pl>
Cc: Ralf Baechle <ralf at linux-mips.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9d5437a15884bfb3429aee99f76fc014c7de039a
Author: Mariusz Kozlowski <m.kozlowski at tuxland.pl>
Date: Fri May 23 13:04:26 2008 -0700
fix parenthesis in include/asm-mips/gic.h
Parenthesis fix in include/asm-mips/gic.h
Signed-off-by: Mariusz Kozlowski <m.kozlowski at tuxland.pl>
Cc: Ralf Baechle <ralf at linux-mips.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8808a793f052c0a67426a24b961402fa20e92814
Author: Darrick J. Wong <djwong at us.ibm.com>
Date: Fri May 23 13:04:25 2008 -0700
ibmaem: new driver for power/energy/temp meters in IBM System X hardware
This driver reads IBM Active Energy Manager energy/temperature/power
sensors on IBM System X hardware.
[akpm at linux-foundation.org: fix printk warnings]
Signed-off-by: Darrick J. Wong <djwong at us.ibm.com>
Cc: "Mark M. Hoffman" <mhoffman at lightlink.com>
Cc: Corey Minyard <minyard at acm.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b8fdaf5a05adbf80e5a943bb3f65b46b5fb9b488
Author: Darrick J. Wong <djwong at us.ibm.com>
Date: Fri May 23 13:04:25 2008 -0700
i5k_amb: support Intel 5400 chipset
Minor rework to support the Intel 5400 chipset.
Signed-off-by: Darrick J. Wong <djwong at us.ibm.com>
Cc: "Mark M. Hoffman" <mhoffman at lightlink.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ca68d0ac16539a062ae26ca50da8b186fa3a0814
Author: Gabor Czigola <czigola at gmail.com>
Date: Fri May 23 13:04:23 2008 -0700
hdaps: invert the axes for HDAPS on Lenovo R61i ThinkPads
Cc: "Mark M. Hoffman" <mhoffman at lightlink.com>
Cc: Dmitry Torokhov <dtor at mail.ru>
Cc: Jiri Kosina <jikos at jikos.cz>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 80bfc25f42db6d4715c7688ae2352c5a8038fe7e
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date: Fri May 23 13:04:22 2008 -0700
ntfs: le*_add_cpu conversion
replace all:
little_endian_variable = cpu_to_leX(leX_to_cpu(little_endian_variable) +
expression_in_cpu_byteorder);
with:
leX_add_cpu(&little_endian_variable, expression_in_cpu_byteorder);
generated with semantic patch
Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
Acked-by: Anton Altaparmakov <aia21 at cantab.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f7232154198f928fc25f420d6190468212a7632a
Author: Johannes Weiner <hannes at saeurebad.de>
Date: Fri May 23 13:04:21 2008 -0700
mm: don't drop a partial page in a zone's memory map size
In a zone's present pages number, account for all pages occupied by the
memory map, including a partial.
Signed-off-by: Johannes Weiner <hannes at saeurebad.de>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f899b0adc6fc8f60a9db8b52f36f06fd1abeaf7c
Author: Karel Zak <kzak at redhat.com>
Date: Fri May 23 13:04:21 2008 -0700
MAINTAINERS: add util-linux-ng package
(akpm: we often deal with util-linux and I (at least) can never remember
where they hang out).
Signed-off-by: Karel Zak <kzak at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 71fd5179e8d1d4d503b517e0c5374f7c49540bfc
Author: Cyrill Gorcunov <gorcunov at gmail.com>
Date: Fri May 23 13:04:20 2008 -0700
ecryptfs: fix missed mutex_unlock
Cc: Michael Halcrow <mhalcrow at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 03fb0bce01490c9bdedad861962c76f987531014
Author: Miklos Szeredi <mszeredi at suse.cz>
Date: Fri May 23 13:04:19 2008 -0700
fuse: fix bdi naming conflict
Fuse allocates a separate bdi for each filesystem, and registers them
in sysfs with "MAJOR:MINOR" of sb->s_dev (st_dev). This works fine for
anon devices normally used by fuse, but can conflict with an already
registered BDI for "fuseblk" filesystems, where sb->s_dev represents a
real block device. In particularl this happens if a non-partitioned
device is being mounted.
Fix by registering with a different name for "fuseblk" filesystems.
Thanks to Ioan Ionita for the bug report.
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Reported-by: Ioan Ionita <opslynx at gmail.com>
Tested-by: Ioan Ionita <opslynx at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 42172d751b4596b8ca4346a1c251b5f1c661ab0c
Author: Nick Piggin <npiggin at suse.de>
Date: Fri May 23 13:04:18 2008 -0700
mm: allow pfnmap ->fault()s
Take out an assertion to allow ->fault handlers to service PFNMAP regions.
This is required to reimplement .nopfn handlers with .fault handlers and
subsequently remove nopfn.
Signed-off-by: Nick Piggin <npiggin at suse.de>
Acked-by: Jes Sorensen <jes at sgi.com>
Cc: Paul Mackerras <paulus at samba.org>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 97ec710cab76f90a6bece76a04e76aa50096a470
Author: Travis Place <wishie at wishie.net>
Date: Fri May 23 18:31:46 2008 +0200
[ALSA] hda - Added support for Foxconn P35AX-S mainboard
Added IDs for the Foxconn P35AX-S mainboard to patch_realtek.c, so
that ALC883_6ST_DIG is used by default.
Signed-off-by: Travis Place <wishie at wishie.net>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 20a3a05dd66ad0f678a587688cc85f0b36869876
Author: Takashi Iwai <tiwai at suse.de>
Date: Fri May 23 17:52:53 2008 +0200
[ALSA] hda - Fix COEF and EAPD in ALC889 auto-configuration mode
Fix the missing COEF and EAPD initialization in ALC889 auto-configuration
mode.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit bc9b56238eedda865070dcaed6694d65b517c8d6
Author: Takashi Iwai <tiwai at suse.de>
Date: Fri May 23 17:50:27 2008 +0200
[ALSA] hda - Fix noise on VT1708 codec
We get quite noisy output on the right channel on VT1708 codec
when 24bit samples are used. Suppress the 24bit support until any
real fix is found.
https://bugzilla.novell.com/show_bug.cgi?id=390473
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit b9e16bc548600124da9d24186364ee8d06040569
Author: Travis Place <wishie at wishie.net>
Date: Wed May 21 16:57:20 2008 +0200
[ALSA] hda - Add model for ASUS P5K-E/WIFI-AP
Added a config table entry for the ASUS P5K-E/WIFI-AP mainboard (ID
1043:8227) to use AD1988_6STACK_DIG
Signed-off-by: Travis Place <wishie at wishie.net>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 1f42ea7bc0ddfadebd9e1c5362b41b53902dbcb1
Author: James Bottomley <James.Bottomley at HansenPartnership.com>
Date: Thu May 22 12:34:41 2008 +0100
[SCSI] fix intermittent oops in scsi_bus_uevent
Reported-by: Sitsofe Wheeler <sitsofe at yahoo.com>
> BUG: unable to handle kernel paging request at e6f17fac
> IP: [<c02604d6>] scsi_bus_uevent+0x1/0x17
> *pde = 2714b163 *pte = 26f17160
> Oops: 0000 [#1] DEBUG_PAGEALLOC
> last sysfs file:
>
> Pid: 1, comm: swapper Not tainted (2.6.26-rc2-next-20080516skw #30)
> EIP: 0060:[<c02604d6>] EFLAGS: 00010282 CPU: 0
> EIP is at scsi_bus_uevent+0x1/0x17
> EAX: e6f18014 EBX: e6f18014 ECX: c02604d5 EDX: e7173000
> ESI: e7173000 EDI: e7173000 EBP: e7851ca0 ESP: e7851c90
> DS: 007b ES: 007b FS: 0000 GS: 0000 SS: 0068
The problem is caused by:
commit b0ed43360fdca227048d88a08290365cb681c1a8
Author: Hannes Reinecke <hare at suse.de>
Date: Tue Mar 18 14:32:28 2008 +0100
[SCSI] add scsi_host and scsi_target to scsi_bus
which added scsi_bus_type to the struct scsi_target device. This
causes both the scsi_device and scsi_target to fire scsi_bus_uevents.
However, the actualy scsi_bus_uevent() call assumes blindly that it's
a struct scsi_device. Check for this and return immediately if it
isn't.
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 7c28472a5d4ecf7c61b3c3901994be878cd6c5d2
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Fri May 23 19:35:52 2008 +0100
[ARM] integrator: fix build warnings and errors
Fix resource_size_t warning in impd1.c, and printascii() build
errors in pci_v3.c
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit c2448278e3be3a43fe0343e138444742af1e99ae
Merge: e6b027a398bcfbb8897353a88a2edfcc97fd604d 5a4f2b675210718aceb4abf41617a3af31bba718
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri May 23 11:11:44 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/mad: Fix kernel crash when .process_mad() returns SUCCESS|CONSUMED
IPoIB: Test for NULL broadcast object in ipiob_mcast_join_finish()
MAINTAINERS: Add cxgb3 and iw_cxgb3 NIC and iWARP driver entries
IB/mlx4: Fix creation of kernel QP with max number of send s/g entries
IB/mthca: Fix max_sge value returned by query_device
RDMA/cxgb3: Fix uninitialized variable warning in iwch_post_send()
IB/mlx4: Fix uninitialized-var warning in mlx4_ib_post_send()
IB/ipath: Fix UC receive completion opcode for RDMA WRITE with immediate
IB/ipath: Fix printk format for ipath_sdma_status
commit 5a4f2b675210718aceb4abf41617a3af31bba718
Author: Dave Olson <dave.olson at qlogic.com>
Date: Fri May 23 10:52:59 2008 -0700
IB/mad: Fix kernel crash when .process_mad() returns SUCCESS|CONSUMED
If a low-level driver returns IB_MAD_RESULT_SUCCESS | IB_MAD_RESULT_CONSUMED,
handle_outgoing_dr_smp() doesn't clean up properly. The fix is to
kfree the local data and break, rather than falling through. This was
observed with the ipath driver, but could happen with any driver.
This fixes <https://bugs.openfabrics.org/show_bug.cgi?id=1027>.
Signed-off-by: Dave Olson <dave.olson at qlogic.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit e6b027a398bcfbb8897353a88a2edfcc97fd604d
Merge: 57f7bd5b455298dbe94227aa1fedbbfe63bbf252 4f74369422b883164c50b5936517d010a3e1ce59
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri May 23 09:24:52 2008 -0700
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
[CPUFREQ] clarify license of freq_table.c
[CPUFREQ] Remove documentation of removed ondemand tunable.
[CPUFREQ] Crusoe: longrun cpufreq module reports false min freq
[CPUFREQ] powernow-k8: improve error messages
commit b1979a5fda7869a790f4fd83fb06c78498d26ba1
Author: Ingo Molnar <mingo at elte.hu>
Date: Mon May 12 21:21:15 2008 +0200
x86: prevent PGE flush from interruption/preemption
CR4 manipulation is not protected against interrupts and preemption,
but KVM uses smp_function_call to manipulate the X86_CR4_VMXE bit
either from the CPU hotplug code or from the kvm_init call.
We need to protect the CR4 manipulation from both interrupts and
preemption.
Original bug report: http://lkml.org/lkml/2008/5/7/48
Bugzilla entry: http://bugzilla.kernel.org/show_bug.cgi?id=10642
This is not a regression from 2.6.25, it's a long standing and hard to
trigger bug.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 57f7bd5b455298dbe94227aa1fedbbfe63bbf252
Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date: Fri May 23 08:40:45 2008 -0700
remove debug printk from DRM suspend path
Not sure how this snuck upstream, but it really doesn't belong there. We
don't need a KERN_ERR printk in the suspend path to know what's going on (at
least not anymore).
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cbff290491cd97bcd449b14f672d98992ddad5cb
Merge: 6483d152acffb83442b90dad1517fde8a7b1e12d 8962cadbe7cbc4ed0fff94f56ebab505a10afd2e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri May 23 08:15:12 2008 -0700
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] iSeries: Remove unused mail address
[POWERPC] mpic: Fix use of uninitialized variable
[POWERPC] Add kernstart_addr to list of allowed symbols in prom_init
[POWERPC] Fix __set_fixmap() for STRICT_MM_TYPECHECKS
[POWERPC] PS3: Fix memory hotplug
commit 6483d152acffb83442b90dad1517fde8a7b1e12d
Merge: cb618965bc2073267b7f9345066f502515fcfdf5 6ab455eeaff6893cd06da33843e840d888cdc04a
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri May 23 08:13:39 2008 -0700
Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6:
[XFS] Fix memory corruption with small buffer reads
[XFS] Fix inode list allocation size in writeback.
[XFS] Don't allow memory reclaim to wait on the filesystem in inode
[XFS] Fix fsync() b0rkage.
[XFS] Include linux/random.h in all builds, not just debug builds.
commit cb618965bc2073267b7f9345066f502515fcfdf5
Merge: 5e2daeb3c982ea19ecad0c2e720a4052034be14b 3401a61e16a5b852d4e353c8850c857105a67a9c
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri May 23 08:13:19 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
stop_machine: make stop_machine_run more virtualization friendly
doc: add a chapter about trylock functions [Bug 9011]
modules: proper cleanup of kobject without CONFIG_SYSFS
module loading ELF handling: use SELFMAG instead of numeric constant
commit 5e2daeb3c982ea19ecad0c2e720a4052034be14b
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu May 22 15:45:08 2008 -0700
fbdev: fix integer as NULL pointer warning
drivers/video/aty/atyfb_base.c:3359:26: warning: Using plain integer as NULL pointer
drivers/video/aty/radeon_base.c:2280:32: warning: Using plain integer as NULL pointer
drivers/video/matrox/matroxfb_base.h:203:25: warning: Using plain integer as NULL pointer
drivers/video/matrox/matroxfb_base.h:203:25: warning: Using plain integer as NULL pointer
drivers/video/sis/sis_main.c:5790:44: warning: Using plain integer as NULL pointer
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9bcf091083065c751a4d90317b766370d2497ae9
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu May 22 15:45:07 2008 -0700
scsi: fix integer as NULL pointer warning
drivers/scsi/aha152x.c:3585:60: warning: Using plain integer as NULL pointer
drivers/scsi/aha152x.c:3845:56: warning: Using plain integer as NULL pointer
drivers/scsi/qla1280.c:2814:37: warning: Using plain integer as NULL pointer
drivers/scsi/atp870u.c:750:47: warning: Using plain integer as NULL pointer
drivers/scsi/3w-9xxx.c:1281:36: warning: Using plain integer as NULL pointer
drivers/scsi/3w-9xxx.c:1293:36: warning: Using plain integer as NULL pointer
drivers/scsi/3w-9xxx.c:1301:35: warning: Using plain integer as NULL pointer
drivers/scsi/hptiop.c:447:10: warning: Using plain integer as NULL pointer
drivers/scsi/hptiop.c:457:10: warning: Using plain integer as NULL pointer
drivers/scsi/hptiop.c:479:24: warning: Using plain integer as NULL pointer
drivers/scsi/hptiop.c:483:22: warning: Using plain integer as NULL pointer
drivers/scsi/hptiop.c:1213:23: warning: Using plain integer as NULL pointer
drivers/scsi/hptiop.c:1214:23: warning: Using plain integer as NULL pointer
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 94b5e0ac694baba20efbe7d8ce6ff9cbe1776162
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu May 22 15:45:07 2008 -0700
isdn: fix integer as NULL pointer warning
drivers/isdn/hysdn/hycapi.c:465:42: warning: Using plain integer as NULL pointer
drivers/isdn/hysdn/hycapi.c:467:44: warning: Using plain integer as NULL pointer
drivers/isdn/hysdn/hycapi.c:469:42: warning: Using plain integer as NULL pointer
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b62151de496d26a705942b945fab9cecdb3fb8da
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu May 22 15:45:06 2008 -0700
acpi: fix integer as NULL pointer warning
drivers/acpi/dispatcher/dsmethod.c:568:50: warning: Using plain integer as NULL pointer
drivers/acpi/executer/exmutex.c:329:30: warning: Using plain integer as NULL pointer
drivers/acpi/executer/exmutex.c:466:31: warning: Using plain integer as NULL pointer
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7fafd91d85181e946207bed18c44addc47e36c63
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Thu May 22 15:45:06 2008 -0700
x86: fix integer as NULL pointer warning
arch/x86/boot/printf.c:59:10: warning: Using plain integer as NULL pointer
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cfb41bf756cac168c829e27def36072dbfbe6fd0
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Fri May 23 15:38:07 2008 +0100
[ARM] fix OMAP include loops
OMAP has two include loops in its header files:
asm-arm/hardware.h <- asm-arm/arch-omap/io.h <-
asm-arm/arch-omap/hardware.h <- asm-arm/hardware.h
asm-arm/arch-omap/board-palmte.h <-
asm-arm/arch-omap/hardware.h <- asm-arm/hardware.h <-
asm-arm/arch-omap/gpio.h <- asm-arm/arch-omap/board-palmte.h
Circular include dependencies are dangerous since they can result in
inconsistent definitions being provided to other code, especially if
'#ifndef' constructs are used.
Solve these by removing the offending includes, and add additional
includes where necessary.
Acked-by: Tony Lindgren <tony at atomide.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 2a740d7a64807acaceb7e44ccf50df35107a34ab
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Fri May 23 13:53:31 2008 +0100
Revert "[ARM] pxa: spitz wants PXA27x UDC definitions"
This reverts commit 53491e042e79578765e2d33512a45d50eb0d8801, which hit
the kernel tree too early.
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 415ad1e50abcc86c235a42fbab57f2b6134412d7
Author: Greg Ungerer <gerg at snapgear.com>
Date: Fri May 23 08:31:39 2008 +0100
[ARM] 5053/1: define before use of processor_id
For the simple read_cpuid() macro case the variable processor_id has
no definition on use of the macro. Add an extern for it. Move all the
processor ID macros into the #ifndef __ASSEMBLEY__ block.
Signed-off-by: Greg Ungerer <gerg at uclinux.org>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 66aaeff1c27545909e502546120be2c5432394e3
Author: Greg Ungerer <gerg at snapgear.com>
Date: Fri May 23 08:26:24 2008 +0100
[ARM] 5052/1: export clock functions for the at91x40
Export the AT91 clock functions for the AT91X40. Some external code common
to all AT91 family parts relys on this, like the gpio and serial support.
Signed-off-by: Greg Ungerer <gerg at uclinux.org>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 50346e621252617a07eb800dfa3f876ccd52d534
Author: Greg Ungerer <gerg at snapgear.com>
Date: Fri May 23 07:16:52 2008 +0100
[ARM] 5051/1: define pgtable_t for the !CONFIG_MMU case too
The non-MMU case also needs the type definition of pgtable_t.
So move it out of a CONFIG_MMU conditional section.
Signed-off-by: Greg Ungerer <gerg at uclinux.org>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit a1289643adb6272c04db9399653ae195072c482a
Author: Andi Kleen <andi at firstfloor.org>
Date: Wed May 14 16:10:42 2008 -0700
x86: use explicit copy in vdso_gettimeofday()
Jeremy's gcc 3.4 seems to be unable to inline a 8 byte memcpy. But the
vdso doesn't support external references. Copy the structure members
of struct timezone explicitely instead.
Signed-off-by: Andi Kleen <ak at linux.intel.com>
Cc: Jeremy Fitzhardinge <jeremy at goop.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 2ddfd20e7c55421435cbf95a5ed3dd6e423cf934
Author: Ingo Molnar <mingo at elte.hu>
Date: Thu May 22 10:37:48 2008 +0200
namespacecheck: automated fixes
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit de067814d6b69030d0030e1c5b3dbaf0385aae41
Author: Jan Beulich <jbeulich at novell.com>
Date: Thu May 15 13:24:52 2008 +0100
x86/xen: fix arbitrary_virt_to_machine()
While I realize that the function isn't currently being used, I still
think an obvious mistake like this should be corrected.
Signed-off-by: Jan Beulich <jbeulich at novell.com>
Acked-by: Jeremy Fitzhardinge <jeremy at goop.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit 2584a82deed7196f48066f1b1a7fad4ec5bea961
Author: Chuck Ebbert <cebbert at redhat.com>
Date: Tue May 20 18:18:12 2008 -0400
x86: don't read maxlvt before checking if APIC is mapped
A check for unmapped apic was added before reading maxlvt but the early
read of maxlvt wasn't removed.
Signed-off-by: Chuck Ebbert <cebbert at redhat.com>
Cc: Andi Kleen <ak at suse.de>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Cc: stable at kernel.org
commit 74dc51a3de06aa516e3b9fdc4017b2aeb38bf44b
Author: Thomas Gleixner <tglx at linutronix.de>
Date: Sun May 18 22:17:59 2008 +0200
x86: disable TSC for sched_clock() when calibration failed
When the TSC calibration fails then TSC is still used in
sched_clock(). Disable it completely in that case.
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Cc: stable at kernel.org
commit 9ccc906c97e34fd91dc6aaf5b69b52d824386910
Author: Thomas Gleixner <tglx at linutronix.de>
Date: Tue May 13 12:31:00 2008 +0200
x86: distangle user disabled TSC from unstable
tsc_enabled is set to 0 from the command line switch "notsc" and from
the mark_tsc_unstable code. Seperate those functionalities and replace
tsc_enable with tsc_disable. This makes also the native_sched_clock()
decision when to use TSC understandable.
Preparatory patch to solve the sched_clock() issue on 32 bit.
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
commit b6db80ee1331e7beaeb91b4b3d946dd16c72e388
Author: Thomas Gleixner <tglx at linutronix.de>
Date: Sun May 18 19:27:48 2008 +0200
x86: fix setup of cyc2ns in tsc_64.c
When the TSC is calibrated against the PIT due to the nonavailability
of PMTIMER/HPET or due to SMI interference then the setup of the per
CPU cyc2ns variables is skipped. This is unlikely to happen but it
would definitely render sched_clock() unusable.
This was introduced with commit 53d517cdbaac704352b3d0c10fecb99e0b54572e
x86: scale cyc_2_nsec according to CPU frequency
Update the per CPU cyc2ns variables in all exit pathes of tsc_calibrate.
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Cc: stable at kernel.org
commit 6ab455eeaff6893cd06da33843e840d888cdc04a
Author: Christoph Hellwig <hch at infradead.org>
Date: Mon May 19 16:34:42 2008 +1000
[XFS] Fix memory corruption with small buffer reads
When we have multiple buffers in a single page for a blocksize == pagesize
filesystem we might overwrite the page contents if two callers hit it
shortly after each other. To prevent that we need to keep the page locked
until I/O is completed and the page marked uptodate.
Thanks to Eric Sandeen for triaging this bug and finding a reproducible
testcase and Dave Chinner for additional advice.
This should fix kernel.org bz #10421.
Tested-by: Eric Sandeen <sandeen at sandeen.net>
SGI-PV: 981813
SGI-Modid: xfs-linux-melb:xfs-kern:31173a
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 289c79a4bd350e8a25065102563ad1a183d1b402
Author: Patrick McHardy <kaber at trash.net>
Date: Fri May 23 00:22:04 2008 -0700
vlan: Use bitmask of feature flags instead of seperate feature bits
Herbert Xu points out that the use of seperate feature bits for features
to be propagated to VLAN devices is going to get messy real soon.
Replace the VLAN feature bits by a bitmask of feature flags to be
propagated and restore the old GSO_SHIFT/MASK values.
Signed-off-by: Patrick McHardy <kaber at trash.net>
Acked-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 7bece8155be133cd67c41eed2b31c60a310609de
Merge: b9a2f2e450b0f770bb4347ae8d48eb2dea701e24 bdefff1f54cb76a19700663f211350de2f65cc91
Author: David S. Miller <davem at davemloft.net>
Date: Fri May 23 00:05:14 2008 -0700
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
commit 8962cadbe7cbc4ed0fff94f56ebab505a10afd2e
Author: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Fri May 23 11:41:46 2008 +1000
[POWERPC] iSeries: Remove unused mail address
I don't use my IBM email address normally and people can find me in
CREDITS.
Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 06a901c5621f85e07e00ac4816c7ca95620ee74a
Author: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Wed May 21 16:24:31 2008 +1000
[POWERPC] mpic: Fix use of uninitialized variable
Compiling ppc64_defconfig with gcc 4.3 gives thes warnings:
arch/powerpc/sysdev/mpic.c: In function 'mpic_irq_get_priority':
arch/powerpc/sysdev/mpic.c:1351: warning: 'is_ipi' may be used uninitialized in this function
arch/powerpc/sysdev/mpic.c: In function 'mpic_irq_set_priority':
arch/powerpc/sysdev/mpic.c:1328: warning: 'is_ipi' may be used uninitialized in this function
It turns out that in the cases where is_ipi is uninitialized, another
variable (mpic) will be NULL and it is dereferenced. Protect against
this by returning if mpic is NULL in mpic_irq_set_priority, and removing
mpic_irq_get_priority completely as it has no in tree callers.
This has the nice side effect of making the warning go away.
Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit d1e8d50d5a4bc7e40b119bf513804188ce2933d0
Author: Michael Ellerman <michael at ellerman.id.au>
Date: Tue May 20 22:48:03 2008 +1000
[POWERPC] Add kernstart_addr to list of allowed symbols in prom_init
Since commit "85xx: Add support for relocatable kernel (and
booting at non-zero)" (37dd2badcfcec35f5e21a0926968d77a404f03c3),
PHYSICAL_START is #defined as kernstart_addr if RELOCATABLE
and FLATMEM is enabled.
PHYSICAL_START is used in prom_init.c and so kernstart_addr
needs to be added to the list of allowed symbols that
prom_init.c can access.
Signed-off-by: Michael Ellerman <michael at ellerman.id.au>
Acked-by: Kumar Gala <galak at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 46a7417963a84f67984af1af59d43261159dd96b
Author: David Gibson <david at gibson.dropbear.id.au>
Date: Mon May 19 16:16:00 2008 +1000
[POWERPC] Fix __set_fixmap() for STRICT_MM_TYPECHECKS
__set_fixmap() in pgtable_32.c currently fails to compile if
STRICT_MM_TYPECHECKS is defined. This fixes it.
Signed-off-by: David Gibson <david at gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit ecc240f90bce23651f9866a1523ba55faa89f009
Author: Geoff Levand <geoffrey.levand at am.sony.com>
Date: Fri May 16 06:09:59 2008 +1000
[POWERPC] PS3: Fix memory hotplug
A change was made to walk_memory_resource() in commit
4b119e21d0c66c22e8ca03df05d9de623d0eb50f that added a
check of find_lmb(). Add the coresponding lmb_add()
call to ps3_mm_add_memory() so that that check will
succeed.
This fixes the condition where the PS3 boots up with
only the 128 MiB of boot memory, and doesn't see the
other 128MiB that is available.
Signed-off-by: Geoff Levand <geoffrey.levand at am.sony.com>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit c8f5f12e46f079a954d4f7163ba59dadee08ca26
Author: David Chinner <dgc at sgi.com>
Date: Tue May 20 11:30:15 2008 +1000
[XFS] Fix inode list allocation size in writeback.
We only need to allocate space for the number of inodes in the cluster
when writing back inodes, not every byte in the inode cluster. This
reduces the amount of memory needing to be allocated to 256 bytes instead
of 64k.
SGI-PV: 981949
SGI-Modid: xfs-linux-melb:xfs-kern:31182a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 49383b0e98ad1f69ff4c816eb1961f703df12318
Author: David Chinner <dgc at sgi.com>
Date: Mon May 19 16:29:34 2008 +1000
[XFS] Don't allow memory reclaim to wait on the filesystem in inode
writeback
If we allow memory reclaim to wait on the pages under writeback in inode
cluster writeback we could deadlock because we are currently holding the
ILOCK on the initial writeback inode which is needed in data I/O
completion to change the file size or do unwritten extent conversion
before the pages are taken out of writeback state.
SGI-PV: 981091
SGI-Modid: xfs-linux-melb:xfs-kern:31015a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit 978b7237123d007b9fa983af6e0e2fa8f97f9934
Author: David Chinner <dgc at sgi.com>
Date: Mon May 19 16:29:46 2008 +1000
[XFS] Fix fsync() b0rkage.
xfs_fsync() fails to wait for data I/O completion before checking if the
inode is dirty or clean to decide whether to log the inode or not. This
misses inode size updates when the data flushed by the fsync() is
extending the file.
Hence, like fdatasync(), we need to wait for I/o completion first, then
check the inode for cleanliness. Doing so makes the behaviour of
xfs_fsync() identical for fsync and fdatasync and we *always* use
synchronous semantics if the inode is dirty. Therefore also kill the
differences and remove the unused flags from the xfs_fsync function and
callers.
SGI-PV: 981296
SGI-Modid: xfs-linux-melb:xfs-kern:31033a
Signed-off-by: David Chinner <dgc at sgi.com>
Signed-off-by: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan at sgi.com>
commit c1e554aeea12d2dab5183e011c27dee6142dc927
Merge: c203e45f069af47ca7623e4dcd8c00bfba2722e4 78b58e549a3098a8c1408d0214bd25e5d5e7a3a3
Author: Lachlan McIlroy <lachlan at redback.melbourne.sgi.com>
Date: Fri May 23 13:48:37 2008 +1000
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
commit 3401a61e16a5b852d4e353c8850c857105a67a9c
Author: Christian Borntraeger <borntraeger at de.ibm.com>
Date: Thu May 8 15:20:38 2008 +0200
stop_machine: make stop_machine_run more virtualization friendly
On kvm I have seen some rare hangs in stop_machine when I used more guest
cpus than hosts cpus. e.g. 32 guest cpus on 1 host cpu triggered the
hang quite often. I could also reproduce the problem on a 4 way z/VM host with
a 64 way guest.
It turned out that the guest was consuming all available cpus mostly for
spinning on scheduler locks like rq->lock. This is expected as the threads are
calling yield all the time.
The problem is now, that the host scheduling decisings together with the guest
scheduling decisions and spinlocks not being fair managed to create an
interesting scenario similar to a live lock. (Sometimes the hang resolved
itself after some minutes)
Changing stop_machine to yield the cpu to the hypervisor when yielding inside
the guest fixed the problem for me. While I am not completely happy with this
patch, I think it causes no harm and it really improves the situation for me.
I used cpu_relax for yielding to the hypervisor, does that work on all
architectures?
p.s.: If you want to reproduce the problem, cpu hotplug and kprobes use
stop_machine_run and both triggered the problem after some retries.
Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
CC: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit 4d2e7d0d77e4e1e8a21cc990c607985fdba20e66
Author: Matti Linnanvuori <mattilinnanvuori at yahoo.com>
Date: Tue May 13 18:31:47 2008 +0300
doc: add a chapter about trylock functions [Bug 9011]
Add a chapter about trylock functions.
http://bugzilla.kernel.org/show_bug.cgi?id=9011
Signed-off-by: Matti Linnanvuori <mattilinnanvuori at yahoo.com>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au> (removed down_trylock)
commit 34e4e2fef4c7a2f7699b3d25e48d871d3ac4c3e7
Author: Denis V. Lunev <den at openvz.org>
Date: Tue May 20 13:59:48 2008 +0400
modules: proper cleanup of kobject without CONFIG_SYSFS
kobject: '<NULL>' (ffffffffa0104050): is not initialized, yet kobject_put() is being called.
------------[ cut here ]------------
WARNING: at /home/den/src/linux-netns26/lib/kobject.c:583 kobject_put+0x53/0x55()
Modules linked in: ipv6 nfsd lockd nfs_acl auth_rpcgss sunrpc exportfs ide_cd_mod cdrom button [last unloaded: pktgen]
comm: rmmod Tainted: G W 2.6.26-rc3 #585
Call Trace:
[<ffffffff802359ab>] warn_on_slowpath+0x58/0x7a
[<ffffffff80236aca>] ? printk+0x67/0x69
[<ffffffff80236aca>] ? printk+0x67/0x69
[<ffffffff80324289>] kobject_put+0x53/0x55
[<ffffffff8025e2ee>] free_module+0x87/0xfa
[<ffffffff8025fee5>] sys_delete_module+0x178/0x1e1
[<ffffffff804b1e70>] ? lockdep_sys_exit_thunk+0x35/0x67
[<ffffffff804b1dff>] ? trace_hardirqs_on_thunk+0x35/0x3a
[<ffffffff8020c0bb>] system_call_after_swapgs+0x7b/0x80
---[ end trace 8f5aafa7f6406cf8 ]---
mod->mkobj.kobj is not initialized without CONFIG_SYSFS. Do not call
kobject_put in this case.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Cc: Rusty Russell <rusty at rustcorp.com.au>
Cc: Kay Sievers <kay.sievers at vrfy.org>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit c4ea6fcf5a192dbba54666f308bdace1c278e0c1
Author: Cyrill Gorcunov <gorcunov at gmail.com>
Date: Wed May 14 16:27:29 2008 -0700
module loading ELF handling: use SELFMAG instead of numeric constant
Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit c511afb41f21857fbbae78f83f88b1247597f46f
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Thu May 22 22:38:36 2008 +0900
sh: update Migo-R defconfig
Update the Migo-R defconfig to include support for KEYSC, I2C, RTC and
NAND and NOR MTD devices.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit fa7ff086008d1af6b7325bf556a0cf70aaf2efd3
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Thu May 22 22:34:28 2008 +0900
sh: use sm501 8250 mfd support on r2d boards
Make use of recently added sm501 8250 uart support, commit
61711f8fd8180e458cfb6846bcf4fc636a95f3db makes the mfd code
handle 8250 uarts so there is no longer need to do it from
the r2d board code.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit b76baf4cf5978efeabf5a3e054551e40ef599b69
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Thu May 22 22:24:51 2008 +0900
sh: add probe support for new sh7723 cut
This patch adds support for sh7723 silicon with a prr value of 0x51.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 760130447248de94943cf75c80fa3ac8fe9d977d
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Thu May 22 22:19:39 2008 +0900
sh: fix VPU interrupt vector for sh7723
This patch fixes a VPU vector typo for sh7723. The correct value is 0x980,
the same as for sh7722.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 526c1c23a23785114f618624e22480a3317388e1
Author: Magnus Damm <magnus.damm at gmail.com>
Date: Thu May 22 22:15:31 2008 +0900
sh: fix USBF resource for sh7722
The USBF function on sh7722 is currently not working with the m66592_udc
driver. The driver is using platform_get_resource_byname() so my commit
a0d29798e568116aa6c32aef7bab2d9e620c88ad broke sh7722 support.
The long term fix is to replace platform_get_resource_byname() in the
driver with platform_get_resource(), but this helps until that happens.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 4f74369422b883164c50b5936517d010a3e1ce59
Author: Dominik Brodowski <linux at dominikbrodowski.net>
Date: Thu May 22 08:52:05 2008 +0200
[CPUFREQ] clarify license of freq_table.c
Signed-off-by: Dominik Brodowski <linux at dominikbrodowski.net>
Signed-off-by: Dave Jones <davej at redhat.com>
commit bdefff1f54cb76a19700663f211350de2f65cc91
Author: Komuro <komurojun-mbn at nifty.com>
Date: Mon May 5 10:51:12 2008 +0900
fmvj18x_cs: add NextCom NC5310 rev B support
fmvj18x_cs: The manfid of "NextCom NC5310 rev B" is MANF_ID_FUJITSU.
but this card is MBH10302 based card.
use ConfigBase to detect the cardtype for this card.
Signed-off-by: Komuro <komurojun-mbn at nifty.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 43fc63dceb8ff58c5ef0a30c70abd31336b5e8b4
Author: Komuro <komurojun-mbn at nifty.com>
Date: Sun Apr 20 14:32:34 2008 +0900
xirc2ps_cs: re-initialize the multicast address in do_reset
keep bit7,8 of XIRCREG42_SWC1 in set_multicast_list.
Signed-off-by: Komuro <komurojun-mbn at nifty.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit f7f312a0c7e7a1947cf193e0e94a257ad7742cb2
Author: Wang Chen <wangchen at cn.fujitsu.com>
Date: Tue May 20 17:13:52 2008 +0800
3C509: rx_bytes should not be increased when alloc_skb failed
If alloc_skb failed, the recieved packet will be dropped. Do not increase
rx_bytes for dropped packet.
Signed-off-by: Wang Chen <wangchen at cn.fujitsu.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 56cfe5d028687468f76e8b613c63ca41f209982d
Author: Wang Chen <wangchen at cn.fujitsu.com>
Date: Thu May 22 18:09:06 2008 +0800
NETFRONT: Use __skb_queue_purge()
Use standard routine for queue purging.
Signed-off-by: Wang Chen <wangchen at cn.fujitsu.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 288369cc2580178ef6ed7c5c63cc1ef08c803250
Author: Wang Chen <wangchen at cn.fujitsu.com>
Date: Thu May 22 18:07:43 2008 +0800
VIRTIO: Use __skb_queue_purge()
Use standard routine for queue purging.
Signed-off-by: Wang Chen <wangchen at cn.fujitsu.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit a01b3d766c0ad3e63978b0f6faf4004688f13522
Author: Paul Gortmaker <paul.gortmaker at windriver.com>
Date: Thu May 22 12:43:50 2008 -0400
phylib: do EXPORT_SYMBOL on get_phy_id
Commit cac1f3c8 factored out the code for get_phy_id so that it
could be reused in multiple places. Turns out that some of the
users can be modular, so we need to export this symbol as well.
Signed-off-by: Paul Gortmaker <paul.gortmaker at windriver.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit b9a2f2e450b0f770bb4347ae8d48eb2dea701e24
Author: Thomas Graf <tgraf at suug.ch>
Date: Thu May 22 10:48:59 2008 -0700
netlink: Fix nla_parse_nested_compat() to call nla_parse() directly
The purpose of nla_parse_nested_compat() is to parse attributes which
contain a struct followed by a stream of nested attributes. So far,
it called nla_parse_nested() to parse the stream of nested attributes
which was wrong, as nla_parse_nested() expects a container attribute
as data which holds the attribute stream. It needs to call
nla_parse() directly while pointing at the next possible alignment
point after the struct in the beginning of the attribute.
With this patch, I can no longer reproduce the reported leftover
warnings.
Signed-off-by: Thomas Graf <tgraf at suug.ch>
Acked-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 76994412f8e824e79a593d6777ec327d85f942b2
Author: Pekka Enberg <penberg at cs.helsinki.fi>
Date: Thu May 22 19:22:25 2008 +0300
slub: ksize() abuse checks
Add a WARN_ON for pages that don't have PageSlab nor PageCompound set to catch
the worst abusers of ksize() in the kernel.
Acked-by: Christoph Lameter <clameter at sgi.com>
Cc: Matt Mackall <mpm at selenic.com>
Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi>
commit b851cb289d905ea04e5f0b518bf3f28407a72118
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Thu May 22 16:38:50 2008 +0100
[ARM] omap: fix omap clk support build errors
arch/arm/plat-omap/clock.c:397: warning: "struct cpufreq_frequency_table" declared inside parameter list
arch/arm/plat-omap/clock.c:397: warning: its scope is only this definition or declaration, which is probably not what you want
arch/arm/plat-omap/clock.c: In function `clk_init_cpufreq_table':
arch/arm/plat-omap/clock.c:402: error: structure has no member named `clk_init_cpufreq_table'
arch/arm/plat-omap/clock.c:403: error: structure has no member named `clk_init_cpufreq_table'
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 75d3bce2fc0a80f435fe12f2c9ed2632c8ac29e4
Merge: a0abb93bf9dc590b031a1123f3e6c6c225c1cdd1 0a891adccc867c28b022128bc342a779e476c816
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu May 22 08:08:25 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
[CIFS] Fix reversed memset arguments
Adds username in the upcall key for unattended mounts with keytab
[CIFS] Remove redundant NULL check
commit 0a891adccc867c28b022128bc342a779e476c816
Author: Dave Jones <davej at redhat.com>
Date: Thu May 22 14:20:21 2008 +0000
[CIFS] Fix reversed memset arguments
Signed-off-by: Dave Jones <davej at redhat.com>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit e4058245ac0c4d9a517cda688a35aef065cb7f4e
Author: Igor Mammedov <niallain at gmail.com>
Date: Wed Apr 2 17:33:47 2008 +0400
Adds username in the upcall key for unattended mounts with keytab
Signed-off-by: Igor Mammedov <niallain at gmail.com>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit 90239bbd598c6a0fc7f2c7352e9886bd3be968d0
Author: Ben Dooks <ben-linux at fluff.org>
Date: Wed May 21 10:24:17 2008 +0100
[ARM] 5039/1: S3C244X: Rename SDI device if running on S3C244X.
Rename the SDI device if on an S3C2440 or S3C2442.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 4ba35fbe293be319b1a5d97951e567c0d9527d09
Author: Philipp Zabel <philipp.zabel at gmail.com>
Date: Thu May 22 10:19:28 2008 +0100
[ARM] 5043/1: pxafb: remove unused mode variable in pxafb_init_fbinfo
Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
Acked-by: Eric Miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit e142848300b1a13d59a6e5fff8c914096d3830fb
Author: Ben Dooks <ben-linux at fluff.org>
Date: Wed May 21 10:25:01 2008 +0100
[ARM] 5041/1: VR1000: Fix DM9000 IRQ flags initialisation
Add the IRQF_TRIGGER_ type to the DM9000 IRQ resource
to stop the driver itself complaining it was not given
any flags to use.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit ace94f9efb8ad2c21b308b3bdf02db984d8b3c5f
Author: Ben Dooks <ben-linux at fluff.org>
Date: Wed May 21 10:24:46 2008 +0100
[ARM] 5040/1: BAST: Fix DM9000 IRQ flags initialisation
Add the IRQF_TRIGGER_ type to the DM9000 IRQ resource
to stop the driver itself complaining it was not given
any flags to use.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 59d83db559315bb75aea849ee773f571ddcc3574
Author: Tony Lindgren <tony at atomide.com>
Date: Mon May 19 05:20:56 2008 +0100
[ARM] 5038/1: ARM: OMAP: Remove tsc2102 references from board-palmte.c
As noted by Russell King. These depend on tsc210x drivers
getting integrated first.
Signed-off-by: Tony Lindgren <tony at atomide.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 864d0ec9db9c0c18b79cebb9d8b7ac75c3b70571
Author: Thomas Kunze <thommycheck at gmx.de>
Date: Mon May 19 22:06:51 2008 +0100
[ARM] 5025/2: fix collie cpu initialisation
collie.h:
* add some meaningfull names to some gpios
collie.c:
* initialize cpu registers correctly
Signed-off-by: Thomas Kunze <thommycheck at gmx.de>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit fa701bd24d6e64a2283d6fa386554775fd4336e7
Author: Krzysztof Halasa <khc at pm.waw.pl>
Date: Mon May 19 19:00:51 2008 +0200
WAN: protect HDLC proto list while insmod/rmmod
WAN: protect protocol list in hdlc.c with RTNL.
Signed-off-by: Krzysztof Hałasa <khc at pm.waw.pl>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 4ecc8c066f3cecb55807644a01435084d8ed638a
Author: Julia Lawall <julia at diku.dk>
Date: Mon May 12 15:38:26 2008 +0200
drivers/net/fs_enet: remove null pointer dereference
The following code appears in the function fs_init_instance in the file drivers/net/fs_enet/fs_enet-main.c.
if (fep->ops == NULL) {
printk(KERN_ERR DRV_MODULE_NAME
": %s No matching ops found (%d).\n",
ndev->name, fpi->fs_no);
err = -EINVAL;
goto err;
}
This code implies that at the point of err, fep->ops can be NULL, so an
extra test is needed before dereferencing this value.
This problem was found using the following semantic match
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@@
expression E, E1;
identifier f;
statement S1,S2,S3;
@@
* if (E == NULL)
{
... when != if (E == NULL) S1 else S2
when != E = E1
* E->f
... when any
return ...;
}
else S3
// </smpl>
Signed-off-by: Julia Lawall <julia at diku.dk>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 0b5923cd477674755dde670ba804649523f27c97
Author: Sreenivasa Honnur <Sreenivasa.Honnur at neterion.com>
Date: Mon May 12 13:43:05 2008 -0400
S2io: Version update for napi and MSI-X patches
- Updated version number
Signed-off-by: Sreenivasa Honnur <sreenivasa.honnur at neterion.com>
Signed-off-by: Ramkrishna Vepa <ram.vepa at neterion.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit f61e0a3544be2f615a0af4aec71eb85a96bdbd62
Author: Sreenivasa Honnur <Sreenivasa.Honnur at neterion.com>
Date: Mon May 12 13:42:17 2008 -0400
S2io: Added napi support when MSIX is enabled.
- Added napi support when MSIX is enabled.
- Moved test_msi function from s2io_open to probe function.
Signed-off-by: Sreenivasa Honnur <sreenivasa.honnur at neterion.com>
Signed-off-by: Ramkrishna Vepa <ram.vepa at neterion.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit ac731ab66960547c33a4e2c504419389ae747067
Author: Sreenivasa Honnur <Sreenivasa.Honnur at neterion.com>
Date: Mon May 12 13:41:32 2008 -0400
S2io: Move all the transmit completions to a single msi-x (alarm) vector
- Move all the transmit completions to a single msi-x (alarm) vector.
- Enable the continuous timer interrupt for only one transmit fifo.
Signed-off-by: Santosh Rastapur <santosh.rastapur at neterion.com>
Signed-off-by: Ramkrishna Vepa <ram.vepa at neterion.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 25c16fffa8ed82d3ef31980d76ff95d3c6430f00
Author: Joe Perches <joe at perches.com>
Date: Mon May 12 14:38:17 2008 -0700
drivers/net/ehea - remove unnecessary memset after kzalloc
Signed-off-by: Joe Perches <joe at perches.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit d04455fba3777fa5c3963348be76510169bbf4df
Author: Francois Romieu <romieu at fr.zoreil.com>
Date: Mon May 12 18:44:21 2008 +0200
au1000_eth: remove useless check
The lifespan of the device covers the request_irq .. free_irq interval.
The cast of a void * pointer is not needed either.
Signed-off-by: Francois Romieu <romieu at fr.zoreil.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 94a47f4161798c34bec7718768f72cf16bcfb4f0
Author: Huang Weiyi <weiyi.huang at gmail.com>
Date: Mon May 12 12:14:04 2008 +0800
Blackfin EMAC Driver: Removed duplicated include <linux/ethtool.h>
Signed-off-by: Huang Weiyi <weiyi.huang at gmail.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit f917d58031fce6dfd7cea71259ea6a2b663ec813
Author: Matteo Croce <matteo at openwrt.org>
Date: Wed May 14 00:58:32 2008 +0200
cpmac bugfixes and enhancements
* Resolve some locking issues using atomic_inc/atomic_dec
* move status code in cpmac_check_status
* unmark the BROKEN flag in Kconfig
* move code which should have been in platform code in
arch/mips/ar7/platform.c
* fixed an IRQ storm which lets the kernel hang
* fixed a double call to netif_start_queue which causes a kernel panic
* don't fail to register the PHY, works on many devices now
Signed-off-by: Matteo Croce <matteo at openwrt.org>
Signed-off-by: Felix Fietkau <nbd at openwrt.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit f47e81fc36371a2f5e2b9792b6a8c56a4564ebbe
Author: Becky Bruce <bgill at freescale.com>
Date: Thu May 1 18:03:11 2008 -0500
e1000e: use resource_size_t, not unsigned long, for phys addrs
The use of unsigned long causes the driver to fail on 32-bit systems
which support 64-bit resources.
Signed-off-by: Becky Bruce <becky.bruce at freescale.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 3d60efb55f634e200fd99e0960a8e099fb38446a
Author: Aurelien Nephtali <aurelien.nephtali at sitadelle.com>
Date: Wed May 14 17:04:13 2008 -0700
net/usb: add support for Apple USB Ethernet Adapter
Add support for Apple USB Ethernet Adapter.
http://store.apple.com/1-800-MY-APPLE/WebObjects/AppleStore.woa/wa/RSLID?nplm=MB442Z/A
Signed-off-by: Aurelien Nephtali <aurelien at sitadelle.com>
Acked-by: Greg KH <greg at kroah.com>
Cc: David Brownell <david-b at pacbell.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 7fa0cba330af3a24f43ac85e14b0b5fed557cdab
Author: Anton Vorontsov <avorontsov at ru.mvista.com>
Date: Fri May 16 23:04:51 2008 +0400
uli526x: add support for netpoll
This patch adds netpoll support for the uli526x ethernet driver --
simply call the interrupt handler for polling.
To do this without disable_irq()/enable_irq() pair we should fully
protect the handler. Luckily, it's already using irqsave spinlock,
the only unprotected place is interrupts re-enabling write. It was
safe to re-enable interrupts without holding the spinlock, but with
netpoll possibility now it doesn't seem so.
Patch was tested using netconsole and KGDBoE.
Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 7f80202bb964dd9c5b408af8100c7f0fd39a15c7
Author: Andy Fleming <afleming at freescale.com>
Date: Thu May 15 17:00:21 2008 -0500
ucc_geth: Fix arguments to dma map/unmap functions
We were passing NULL as the device. When we actually start supporting
more interesting memory configurations, this will break things, so
we proactively are fixing the bug.
Signed-off-by: Andy Fleming <afleming at freescale.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 940608be2e6117c17c19b203f7393ced4d02590a
Author: Maciej W. Rozycki <macro at linux-mips.org>
Date: Sat May 17 07:07:36 2008 +0100
PHYLIB: Kconfig: Fix the dependency on S390
PHYLIB was first marked as BROKEN on S390, then the enclosing menu marked
as non-S390, then the two dependencies merged with the conversion to
menuconfig. Reduce to non-S390.
Signed-off-by: Maciej W. Rozycki <macro at linux-mips.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 5a0a92e67b5009a71e011658da04fb92dad8961f
Author: Gerrit Renker <gerrit at erg.abdn.ac.uk>
Date: Sat May 17 08:35:36 2008 +0100
[SC92031] Using padto turned driver into an IPv6-only interface
IPv4 would work with this driver only with static arp table entries,
the patch reverts a padto introduced in
commit 26a17b7bbb36a8552d531bc1ad08472fb5aa3007
sc92031: start transmit return value bugfix
The padto does not work because the driver code evaluates `len' later on and
there are cases where skb->len is not updated accordingly.
This was observed with ARP frames (skb->len = 42 bytes, !skb_cloned(),
skb_tailroom = 84 bytes). Then in skb_pad(), the first condition is true, where
skb->len is not updated. As a consequence, the driver uses 42 bytes instead of
the 60 bytes, and the ARP frame never makes it onto the wire.
Signed-off-by: Gerrit Renker <gerrit at erg.abdn.ac.uk>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 789585e968f07653a29a9e829aed20386043636c
Author: Stephen Hemminger <shemminger at vyatta.com>
Date: Sun May 18 04:45:09 2008 +0100
sb1250: use netdev_alloc_skb
Use netdev_alloc_skb. This sets skb->dev and allows arch specific
allocation. Also simplify and cleanup the alignment code.
Signed-off-by: Stephen Hemminger <shemminger at vyatta.com>
Signed-off-by: Maciej W. Rozycki <macro at linux-mips.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 40ba182e3ca9f019f299ce5052fcd7e4cf68d11b
Author: Tobias Diedrich <ranma+kernel at tdiedrich.de>
Date: Sun May 18 15:00:36 2008 +0200
[netdrvr] forcedeth: Restore multicast settings on resume
nv_open() resets multicast settings, call nv_set_multicast(dev)
to restore them. (Maybe this should rather be moved into nv_open())
Signed-off-by: Tobias Diedrich <ranma+kernel at tdiedrich.de>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit aff26e2faa782e196f28b86d04b093fd3bae1ffb
Author: Krzysztof Halasa <khc at pm.waw.pl>
Date: Mon May 19 19:11:08 2008 +0200
WAN: protect Cisco HDLC state changes with a spinlock.
Signed-off-by: Krzysztof Hałasa <khc at pm.waw.pl>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 0178ec3d3e4e48c63b350e712835a4a5c15c6c86
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue May 20 00:53:00 2008 +0300
make myri10ge_get_firmware_capabilities() static
This patch makes the needlessly global
myri10ge_get_firmware_capabilities() static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 7ad62dbcb5766dae38516e0333a6f68a1b6df884
Author: Ilpo Järvinen <ilpo.jarvinen at helsinki.fi>
Date: Tue May 13 14:16:54 2008 +0300
s2io: add missing block braces to multistatement if statement
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen at helsinki.fi>
Cc: Ramkrishna Vepa <ram.vepa at neterion.com>
Cc: Rastapur Santosh <santosh.rastapur at neterion.com>
Cc: Sivakumar Subramani <sivakumar.subramani at neterion.com>
Cc: Sreenivasa Honnur <sreenivasa.honnur at neterion.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 6941727a08d49c88a58bc3afb55044df7932549e
Author: Ilpo Järvinen <ilpo.jarvinen at helsinki.fi>
Date: Tue May 13 14:16:53 2008 +0300
hamradio/scc: add missing block braces to multi-statement if
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen at helsinki.fi>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 7fb1c2ac8ecaf0883f2fcb38dfc9ec2d15cee11d
Author: Brian King <brking at linux.vnet.ibm.com>
Date: Wed May 14 09:48:25 2008 -0500
ehea: Fix use after free on reboot
Fixes the following use after free oops:
ehea: Reboot: freeing all eHEA resources
Unable to handle kernel paging request for data at address 0x6b6b6b6b6b6b6c5b
Faulting instruction address: 0xd000000000354488
cpu 0x0: Vector: 300 (Data Access) at [c00000002ec6f310]
pc: d000000000354488: .ehea_shutdown_single_port+0x50/0x78 [ehea]
lr: d00000000035447c: .ehea_shutdown_single_port+0x44/0x78 [ehea]
sp: c00000002ec6f590
msr: 8000000000009032
dar: 6b6b6b6b6b6b6c5b
dsisr: 40000000
current = 0xc0000000281412e0
paca = 0xc0000000006df300
pid = 10930, comm = reboot
enter ? for help
[c00000002ec6f590] d00000000035d64c .ehea_remove+0x44/0x124 [ehea] (unreliable)
[c00000002ec6f630] c000000000319f88 .of_platform_device_remove+0x40/0x58
[c00000002ec6f6a0] c000000000291018 .__device_release_driver+0xb0/0xf0
[c00000002ec6f730] c000000000291120 .driver_detach+0xc8/0xfc
[c00000002ec6f7c0] c00000000028fe24 .bus_remove_driver+0xb4/0x114
[c00000002ec6f850] c000000000291768 .driver_unregister+0x54/0x74
[c00000002ec6f8e0] c00000000031a0c8 .of_unregister_driver+0x14/0x28
[c00000002ec6f950] c000000000023ba0 .ibmebus_unregister_driver+0x10/0x24
[c00000002ec6f9c0] d000000000354180 .ehea_reboot_notifier+0x30/0x4c [ehea]
[c00000002ec6fa40] c0000000003c95a8 .notifier_call_chain+0x5c/0xcc
[c00000002ec6fae0] c000000000082cd4 .__blocking_notifier_call_chain+0x70/0xb0
[c00000002ec6fb90] c000000000075cf8 .kernel_restart_prepare+0x24/0x58
[c00000002ec6fc10] c000000000075f0c .kernel_restart+0x20/0x6c
[c00000002ec6fc90] c000000000078674 .sys_reboot+0x1d4/0x290
[c00000002ec6fe30] c0000000000086ac syscall_exit+0x0/0x40
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 74ef5c5025fed5ad6a1cbdfb5c2e831acdbbd2fe
Author: Pierre Ynard <linkfanel at yahoo.fr>
Date: Wed May 14 16:20:16 2008 -0700
rndis_host: increase delay in command response loop
Some devices running some WinCE firmware (with SC_* Samsung processors
according to the SynCE project, verified on a HTC P3600 device) fail to
register because they apparently need extra time to respond correctly to
requests. Increase the existing delay to satisfy them. Based on code
from the SynCE project, on a suggestion of David Brownell.
This patch Works For Me(tm).
Signed-off-by: Pierre Ynard <linkfanel at yahoo.fr>
