development kernel tree: Changes to 'mokopatches-tracking'
git at git.openmoko.org
git at git.openmoko.org
Sun Aug 3 21:25:08 CEST 2008
Rebased ref, commits from common ancestor:
commit f1d6cf628bcdc76a55d95675556ea20645d4108a
Author: Andy Green <andy at openmoko.com>
Date: Sun Aug 3 20:24:34 2008 +0100
fix-wm8753-DBG.patch
Signed-off-by: Andy Green <andy at openmoko.com>
commit df0ddcb9c5be91c9db848763a8b401be9c5919ab
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:33 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 ef5137a8b9500aa8dc9bcb121475f4f96554f15f
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:33 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 6f63c67a4fdafca37dc386a1c8bc9cc730279507
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:32 2008 +0100
suspend-prelim1.patch
commit 1c9f8f831b5cf3aa7a45322a660c394a1cd3f15a
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:31 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 9eb46ddda94cbe1a60ac64c994b371349fa6aa5c
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:31 2008 +0100
fix-pcf50633-LOWBAT-kill-init.patch
commit 0fca57b3a4e5fbbadefdff0ffc7735eaeb83c0d2
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:31 2008 +0100
fix-pcf50606-LOWBAT-kill-init.patch
commit e8aca99336e4d975b3b2c1e98f8b84ebf65296d2
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:31 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 82368bf18ef33bfaa43f9bb319fc4f04bf192f3b
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:29 2008 +0100
atheros_2_0_sdio_stack.patch
commit 0057260f24c782e253193bfaba5061e0da9bed23
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:29 2008 +0100
atheros_2_0_hcd.patch
commit 5642721135a834d99d68ad0ac5baa90564bb07e1
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:29 2008 +0100
atheros_2_0_function.patch
commit 0453cd716bad1ef6f93079bdfb972f2d0a046fb7
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:29 2008 +0100
pnp_fixes.patch
commit cba4c16ad382ee1f566560a20185c22b243f0d1d
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:28 2008 +0100
s3c2410-usb-switch.patch
commit f51327d156b69a7a5e6c2a5c08df698fcc1151c0
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:28 2008 +0100
fix-EVIOCGRAB-semantics.patch
commit a47fa22a94d9514f5071e6ad01ee78256512eeeb
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:28 2008 +0100
bq27000-battery-driver.patch
commit cac0d500a655fe9bba8eaf4597b6b435198beaba
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:27 2008 +0100
fiq-hdq.patch
commit 9c75e2203981fc0391bc5122d375f900606f9c62
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:26 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 e4f40c324728d139629dfd07dc80ee25d5fd786a
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:26 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 b4f2e8333885bed2fcbe37381031b2d20302f1a0
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:26 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 ab11ca83876501c18c3009f75aaba06bf4f44322
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:26 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 c5fc2243e60d34da5924d4eb9516ead2d17e784c
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:24 2008 +0100
s3c2410-qt2410-buttons.patch
commit 7f8d728ed0e670c1313777a50675d73be0e1d6a4
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:24 2008 +0100
qt2410-cs8900.patch
commit 89b963aa329ba19107b472da4060b582ab9c9439
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:24 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 643a1cd4b3e9c7f2f2d02bfd15a99e74ab3b6d93
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:24 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 71eddb29b70a8d10b928624461534c3cd125d32f
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:24 2008 +0100
s3c2410_serial-nodebug.patch
commit d7f4b99b44f63b3a739f4fc0416c346f26143b27
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:24 2008 +0100
pm-debug_less_verbose.patch
commit afbe6d8af40e380ca8861746e7cd9416eb6b71a5
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:23 2008 +0100
config-nr-tty-devices.patch
commit f9c27b5dea7fa4510a5bbab74b3c75a0a8c6eaa5
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:23 2008 +0100
openmoko-logo.patch
commit d7aeaf172cb002f2860feedef160de9d38d82fd0
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:23 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 c9d7dbe2e8f9d7562f8a97ffa23780fa2a0b2858
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:23 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 b5c010dc3e36c0358f037031ea63dd77a25e496e
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:22 2008 +0100
gta02-acc.patch
commit 76e26de507f8a49fb363f327ad986890cf38a5c7
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:22 2008 +0100
gta02-leds.patch
commit f4ded935c1e77d0adb4a6e97da556c03750e67f6
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:22 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 0086a0dea82fb96d2f79fa58db54eabdf88074cd
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:22 2008 +0100
gta02-sound.patch
commit 37a53ee28312259cf0b363adbba1fe4bffed3fad
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:21 2008 +0100
gta02-power_control.patch
commit 499886622d90afc78b54563bac6ba5b120ddde3f
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:21 2008 +0100
gta02-core.patch
commit 6b456161384181f9c657bbbaf8ae45ccbbb3a4d4
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:21 2008 +0100
glamo-mmc.patch
commit 6a930ca1843630f13fcdf75724db2bb84b23b7c8
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:21 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 5a56cd9a437330d6aa30fc316fe3d2ee1852bca7
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:20 2008 +0100
pcf50633-suspend-hacks.patch
commit eb102226ae5b57f2a704335305dc5ee8753fb0bf
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:19 2008 +0100
pcf50633.patch
commit 1f2de9e10daa65911c57dae314d5a18f14e0ad1e
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:19 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 6a9056d5bffb2174543666d4c46a40cf47dcf1c5
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:19 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 9d5f67cd8fa46ad81783df7554e1deaaa241e525
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:19 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 e893ea4d96b4a12bee0d686a6ffe190841a11c41
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:19 2008 +0100
s3c_mci-gta01.patch
commit 97dea51aae603b6b6810124c54efa1d1958b0b97
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:18 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 d245b2c56b6f9ea8d2ec641a03c3e2ca5c393790
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:18 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 a554d58e559d5b8f763155e313c5cba6f2e63bf6
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:18 2008 +0100
g_ether-highpower.patch
commit 6b558eeff5fb9f7718831f5fc736368af3c89e4d
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:18 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 db6f1e4d44793c59e1dd19548769e3072e605614
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:18 2008 +0100
s3c2410_ts-gta01.patch
commit 805f3582946c21866297afd00b3ce5bebdab6656
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:17 2008 +0100
s3c2410_touchscreen.patch
commit ce6fb8269ebb85b28ac60ce34766069e1c1c9de5
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:17 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 8939e7598c241d1d4f63b8092a27bc5770af1dba
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:17 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 def7d6c393cc91ea9ca276c55f9769596c944b0f
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:17 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 d8e84cc22f717b7589a503dc3a2b9c5d537d0561
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:17 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 9e59a0870b3f2781f6bcc8b42a987d0ddb5e0495
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:16 2008 +0100
gta01-inputdevice.patch
This provides support for the GTA01 keyboard
Signed-off-by: Harald Welte <laforge at openmoko.org>
commit bca8d4821eeb09a292bfa454fe56d51fb5525666
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:16 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 d5eddf0cffb2c007020a0f58e10e90318165970f
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:16 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 3435a2e96d6da3af6af2187fa5a7f26b045fd665
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:16 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 e6b5edf3c11b8375ec57c0e1974cfeba7c206493
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:15 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 6bf29d025de08a1941c5266ae7cde33ecc87309e
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:14 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 caa2fe133907ef33822f8e889eb9a9c32a85d89f
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:14 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 3d8158cf6f5931dde1837f38fce65d67d0a66fc7
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:14 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 fd9515c7bf3d3e67892450022fa67af0be14e218
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 3 20:24:14 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 2b12a4c524812fb3f6ee590a02e65b95c8c32229
Merge: 4744b43431e8613f920c5cba88346756f53c5165 7f30491ccd28627742e37899453ae20e3da8e18f
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Aug 1 14:59:11 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] Move include/asm-ia64 to arch/ia64/include/asm
commit 4744b43431e8613f920c5cba88346756f53c5165
Author: Tim Bird <tim.bird at am.sony.com>
Date: Fri Aug 1 14:05:50 2008 -0700
embedded: fix vc_translate operator precedence
This fixes a bug in operator precedence in the newly introduced vc_translate
macro. Without this fix, the translation of some characters on the
kernel console is garbled.
This patch was copied to the e-mail list previously for testing. Now,
all reports confirm that it works, so this is an official post for
application.
Signed-off-by: Tim Bird <tim.bird at am.sony.com>
Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
commit 3669bc143fb3d389918379547f4a6b28a757b7fe
Author: Jack Steiner <steiner at sgi.com>
Date: Fri Aug 1 15:08:15 2008 -0500
Remove EXPORTS of follow_page & zap_page_range
Delete 2 EXPORTs that were accidentally sent upstream.
Signed-off-by: Jack Steiner <steiner at sgi.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a97762a77f927577525868e39661084170ce3605
Author: Steven Rostedt <rostedt at goodmis.org>
Date: Thu Jul 31 12:40:52 2008 -0400
dual license ftrace.txt
I asked legal about the licensing of ftrace.txt, and they told me that,
unless the Documentation directory is specifically set up to handle non
GPL licenses (which it does not appear to be), then it would be best to
put ftrace.txt under the GPL.
This patch adds a dual license to ftrace.txt such that it is under both
the FDL and the GPL.
Signed-off-by: Steven Rostedt <srostedt at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 784dd7b64ca661722f539db906d56ce54906f2fb
Author: David Howells <dhowells at redhat.com>
Date: Thu Jul 31 13:46:33 2008 +0100
FRV: Wire up new system calls
Wire up for FRV the system calls that were added in the last merge window.
Signed-off-by: David Howells <dhowells at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 02c363808981b67e631fe71cc7e952497f761bef
Author: David Howells <dhowells at redhat.com>
Date: Thu Jul 31 13:01:30 2008 +0100
MN10300: Wire up new system calls
Wire up system calls added in the last merge window for the MN10300 arch.
Signed-off-by: David Howells <dhowells at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3ab36ab68531ad90648fdeedcaf437f121572ede
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date: Thu Jul 31 10:03:19 2008 +0100
try harder to load tty ldisc driver
Currently function tty_ldisc_get() tries to load an ldisc driver module
only when tty_ldisc_try_get() returns -EAGAIN. This happens only if
module is being unloaded. If ldisc module is not loaded
tty_ldisc_try_get() returns -EINVAL and this case is not handled in
tty_ldisc_get(), so request_module() is not called.
Attached patch fixes this by calling request_module() if
tty_ldisc_try_get() returned any error code.
I discovered this when my UMTS modem stopped working with 2.6.27-rc1
because module ppp_async was not loaded.
Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 84ff7a001270258f71d6ab0d164f351e32c9718a
Merge: 478735e42bfa047384afa72dceb408035532db20 1f4170e12db06fdde5279d665a7e6e2976b2b623
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Aug 1 12:48:16 2008 -0700
Merge branch 'kvm-updates-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm
* 'kvm-updates-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
KVM: s390: Fix kvm on IBM System z10
KVM: Advertise synchronized mmu support to userspace
KVM: Synchronize guest physical memory map to host virtual memory map
KVM: Allow browsing memslots with mmu_lock
KVM: Allow reading aliases with mmu_lock
commit 478735e42bfa047384afa72dceb408035532db20
Merge: 0ef89d25d3e390dfa7c46772907951744a4067dc 6f5fd8e9b98423add5f67b964e7cc8733dd73460
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Aug 1 12:47:53 2008 -0700
Merge branch 'zero-len' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* 'zero-len' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
drivers/media, include/media: delete zero-length files
commit 0ef89d25d3e390dfa7c46772907951744a4067dc
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Thu Jul 31 00:07:30 2008 -0700
mm/hugetlb: don't crash when HPAGE_SHIFT is 0
Some platform decide whether they support huge pages at boot time. On
these, such as powerpc, HPAGE_SHIFT is a variable, not a constant, and is
set to 0 when there is no such support.
The patches to introduce multiple huge pages support broke that causing
the kernel to crash at boot time on machines such as POWER3 which lack
support for multiple page sizes.
Signed-off-by: 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 c6de002617c199f80f9a2a713dffc263bdc69b81
Author: Yoshinori Sato <ysato at users.sourceforge.jp>
Date: Thu Jul 31 00:07:29 2008 -0700
Missing symbol prefix on vmlinux.lds.h
ARCH=h8300:
init/main.c:781: undefined reference to `___early_initcall_end'
Same problem have
__start___bug_table
__stop___bug_table
__tracedata_start
__tracedata_end
__per_cpu_start
__per_cpu_end
When defining a symbol in vmlinux.lds, use the VMLINUX_SYMBOL macro.
VMLINUX_SYMBOL adds a prefix charactor.
You can't just use straight symbol names in common header files as they
dont take into consideration weird arch-specific ABI conventions. in the
case of Blackfin/h8300, the ABI dictates that any C-visible symbols have
an underscore prefixed to them. Thus all symbols in vmlinux.lds.h need to
be wrapped in VMLINUX_SYMBOL() so that each arch can put hide this magic
in their own files.
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Yoshinori Sato <ysato at users.sourceforge.jp>
Cc: Jeremy Fitzhardinge <jeremy at goop.org>
Cc: "Mike Frysinger" <vapier.adi at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ea44c1d60df3640bd956a67c392865c44fe9bc45
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Thu Jul 31 00:07:27 2008 -0700
PNP: fix formatting of dbg_pnp_show_resources() output
Each resource should be printed on its own line, so start snprintf'ing
at the beginning of the buffer every time through the loop.
Also, use scnprintf() rather than snprintf() when building up the
buffer to print. scnprintf() returns the number of characters actually
written into the buffer (not including the trailing NULL).
snprintf() returns the number of characters that *would be* written,
assuming everything would fit in the buffer. That's nice if we want to
resize the buffer to make sure everything fits, but in this case, I
just want to keep from overflowing the buffer, and it's OK if the
output is truncated.
Using snprintf() meant that my "len" could grow to be more than the
the buffer size, which makes "sizeof(buf) - len" negative, which causes
this alarming WARN_ON:
http://marc.info/?l=linux-kernel&m=121736480005656&w=2
More useful snprintf/scnprintf discussion:
http://lwn.net/Articles/69419/
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Reported-by: Pete Clements <clem at clem.clem-digital.net>
Cc: Rene Herman <rene.herman at keyaccess.nl>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 61a2d07d3fb1ac34d142b9b62d4cd60a0f8c229e
Author: Niels de Vos <niels at nixpanic.net>
Date: Thu Jul 31 00:07:23 2008 -0700
Remove newline from the description of module parameters
Some module parameters with only one line have the '\n' at the end of the
description. This is not needed nor wanted as after the description the
type (i.e. int) is followed by a newline.
Some modules contain a multi-line description, these are not affected
by this patch.
Signed-off-by: Niels de Vos <niels.devos at wincor-nixdorf.com>
Acked-by: Randy Dunlap <randy.dunlap at oracle.com>
Cc: John W. Linville <linville at tuxdriver.com>
Cc: Ed L. Cashin <ecashin at coraid.com>
Cc: Dave Airlie <airlied at linux.ie>
Cc: Roland Dreier <rolandd at cisco.com>
Acked-by: Mauro Carvalho Chehab <mchehab at infradead.org>
Cc: Jeff Garzik <jeff at garzik.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3a4b7886ee59e122d359e1714ed89585a06645ad
Merge: b8a327be3fbf05b5d3a935b4c03a3dcdb6db833e 963e4975c6f93c148ca809d986d412201df9af89
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Aug 1 12:41:29 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:
pata_it821x: Driver updates and reworking
libata.h: replace __FUNCTION__ with __func__
ata_piix: subsys 106b:00a3 is apple ich8m too
libata-core: make sure that ata_force_tbl is freed in case of an error
libata: update atapi disable handling
pata_via: add VX800 flag; add function for fixing h/w bugs
pata_ali: misplaced pci_dev_put()
commit b8a327be3fbf05b5d3a935b4c03a3dcdb6db833e
Merge: 46bd58eab21650fe820e4e3a27a6a134892cc2eb f13fae2d2a9372a5155d20bc9da4c14f02193277
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Aug 1 12:39:09 2008 -0700
Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-pull
* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-pull: (64 commits)
[XFS] Remove vn_revalidate calls in xfs.
[XFS] Now that xfs_setattr is only used for attributes set from ->setattr
[XFS] xfs_setattr currently doesn't just handle the attributes set through
[XFS] fix use after free with external logs or real-time devices
[XFS] A bug was found in xfs_bmap_add_extent_unwritten_real(). In a
[XFS] fix compilation without CONFIG_PROC_FS
[XFS] s/XFS_PURGE_INODE/IRELE/g s/VN_HOLD(XFS_ITOV())/IHOLD()/
[XFS] fix mount option parsing in remount
[XFS] Disable queue flag test in barrier check.
[XFS] streamline init/exit path
[XFS] Fix up problem when CONFIG_XFS_POSIX_ACL is not set and yet we still
[XFS] Don't assert if trying to mount with blocksize > pagesize
[XFS] Don't update mtime on rename source
[XFS] Allow xfs_bmbt_split() to fallback to the lowspace allocator
[XFS] Restore the lowspace extent allocator algorithm
[XFS] use minleft when allocating in xfs_bmbt_split()
[XFS] attrmulti cleanup
[XFS] Check for invalid flags in xfs_attrlist_by_handle.
[XFS] Fix CI lookup in leaf-form directories
[XFS] Use the generic xattr methods.
...
commit 46bd58eab21650fe820e4e3a27a6a134892cc2eb
Author: Dean Nelson <dcn at sgi.com>
Date: Fri Aug 1 09:55:26 2008 -0500
add reverse dependency of CONFIG_SGI_XP upon CONFIG_SGI_GRU
Add a reverse dependency of CONFIG_SGI_XP upon CONFIG_SGI_GRU to Kconfig.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3b0de7b364c8b8a975f201fdae2fb394c876eb56
Author: Dean Nelson <dcn at sgi.com>
Date: Fri Aug 1 14:19:08 2008 -0500
add dependency of CONFIG_SGI_XP upon CONFIG_NET
Add a dependency of CONFIG_SGI_XP upon CONFIG_NET to Kconfig.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5c7edcd7ee6b77b88252fe4096dce1a46a60c829
Author: Roland McGrath <roland at redhat.com>
Date: Thu Jul 31 02:04:09 2008 -0700
tracehook: fix exit_signal=0 case
My commit 2b2a1ff64afbadac842bbc58c5166962cf4f7664 introduced a regression
(sorry about that) for the odd case of exit_signal=0 (e.g. clone_flags=0).
This is not a normal use, but it's used by a case in the glibc test suite.
Dying with exit_signal=0 sends no signal, but it's supposed to wake up a
parent's blocked wait*() calls (unlike the delayed_group_leader case).
This fixes tracehook_notify_death() and its caller to distinguish a
"signal 0" wakeup from the delayed_group_leader case (with no wakeup).
Signed-off-by: Roland McGrath <roland at redhat.com>
Tested-by: Serge Hallyn <serue at us.ibm.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1e24b15b267293567a8d752721c7ae63f281325a
Merge: 63a16f90167850010864a9e8ebb71d216983090f 388667bed591b2359713bb17d5de0cf56e961447
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Aug 1 11:56:07 2008 -0700
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md:
md: raid10: wake up frozen array
md: do not count blocked devices as spares
md: do not progress the resync process if the stripe was blocked
md: delay notification of 'active_idle' to the recovery thread
md: fix merge error
md: move async_tx_issue_pending_all outside spin_lock_irq
commit 63a16f90167850010864a9e8ebb71d216983090f
Merge: 5adf2b03d97111c8955495ba11e8b7db27df8695 c259ae52e204d42f8b2d484c85517a4c367030e1
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Aug 1 11:54:05 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] ocfs2: Release mutex in error handling code
[PATCH] ocfs2: Fix oops when racing files truncates with writes into an mmap region
[PATCH 2/2] ocfs2: Fix race between mount and recovery
[PATCH 1/2] ocfs2: Add counter in struct ocfs2_dinode to track journal replays
[PATCH] configfs: Convenience macros for attribute definition.
[PATCH] configfs: Pin configfs subsystems separately from new config_items.
[PATCH] configfs: Fix open directory making rmdir() fail
[PATCH] configfs: Lock new directory inodes before removing on cleanup after failure
[PATCH] configfs: Prevent userspace from creating new entries under attaching directories
[PATCH] configfs: Fix failing symlink() making rmdir() fail
[PATCH] configfs: Fix symlink() to a removing item
[PATCH] configfs: Include linux/err.h in linux/configfs.h
commit 5adf2b03d97111c8955495ba11e8b7db27df8695
Merge: e811603feb198079bcdb3f75f72cbf9681de2062 0e241ffd306c0896bb9959be7faa4d4cfcb706d9
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Aug 1 11:52:39 2008 -0700
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
locking: fix mutex @key parameter kernel-doc notation
commit e811603feb198079bcdb3f75f72cbf9681de2062
Merge: b17b3d479c4c43c3a980ee553c3be3ca456523de 48a61569bb5396415c5dad0e81e1cfeb87c0aca3
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Aug 1 11:50:21 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: scripts/ver_linux: don't set PATH
Kconfig/init: change help text to match default value
kbuild: genksyms: Include extern information in dumps
kbuild: genksyms parser: fix the __attribute__ rule
kbuild: scripts/genksyms/lex.l: add %option noinput
kconfig: scripts/kconfig/zconf.l: add %option noinput
kbuild: fix O=... build of um
commit b17b3d479c4c43c3a980ee553c3be3ca456523de
Merge: 31582b094d640fdab3fd29237b348a4c7c8646fb 93769f58078e2a066b56217cae1e343ac5a6b78c
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Aug 1 11:46:00 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:
md: the bitmap code needs to use blk_plug_device_unlocked()
block: add a blk_plug_device_unlocked() that grabs the queue lock
commit 31582b094d640fdab3fd29237b348a4c7c8646fb
Merge: df1efe6f871e2d3f83e6ad7b7a1d2b728b478fc2 25fc999913839a45cbb48ac7872e67f7521e7ed9
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Aug 1 11:45:09 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:
kgdb: fix gdb serial thread queries
kgdb: fix kgdb_validate_break_address to perform a mem write
kgdb: remove the requirement for CONFIG_FRAME_POINTER
commit df1efe6f871e2d3f83e6ad7b7a1d2b728b478fc2
Merge: 9a5467fd600669cda488771dac3e951034fe2b08 11589418a1c4cf68be9367f802898d35e07809c4
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Aug 1 11:44:24 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: ASoC: Export dapm_reg_event() fully
ALSA: ASoC: Update Poodle to current ASoC API
ALSA: asoc: restrict sample rate and size in Freescale MPC8610 sound drivers
ALSA: sound/soc/pxa/tosa.c: removed duplicated include
commit 9a5467fd600669cda488771dac3e951034fe2b08
Merge: 676056132425ac425d7215cdaa8bd25582e07966 00b1304c4ca81dd893973cc620b87a5c3ff3f660
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Aug 1 11:35:16 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: (46 commits)
tcp: MD5: Fix IPv6 signatures
skbuff: add missing kernel-doc for do_not_encrypt
net/ipv4/route.c: fix build error
tcp: MD5: Fix MD5 signatures on certain ACK packets
ipv6: Fix ip6_xmit to send fragments if ipfragok is true
ipvs: Move userspace definitions to include/linux/ip_vs.h
netdev: Fix lockdep warnings in multiqueue configurations.
netfilter: xt_hashlimit: fix race between htable_destroy and htable_gc
netfilter: ipt_recent: fix race between recent_mt_destroy and proc manipulations
netfilter: nf_conntrack_tcp: decrease timeouts while data in unacknowledged
irda: replace __FUNCTION__ with __func__
nsc-ircc: default to dongle type 9 on IBM hardware
bluetooth: add quirks for a few hci_usb devices
hysdn: remove the packed attribute from PofTimStamp_tag
isdn: use the common ascii hex helpers
tg3: adapt tg3 to use reworked PCI PM code
atm: fix direct casts of pointers to u32 in the InterPhase driver
atm: fix const assignment/discard warnings in the ATM networking driver
net: use the common ascii hex helpers
random32: seeding improvement
...
commit 676056132425ac425d7215cdaa8bd25582e07966
Merge: 623fa579e61f250c1913c70257ef3a753820bb68 47d715af0761012ab074a12b5b5959f0179eaa09
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Aug 1 11:33:19 2008 -0700
Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6
* 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6:
hwmon: needs new maintainer
hwmon: (lm85) Simplify device initialization function
hwmon: (lm85) Misc cleanups
hwmon: (lm85) Don't write back cached values
hwmon: (lm85) Drop dead code
hwmon: (lm85) Coding-style cleanups
hwmon: (lm75) add new-style driver binding
hwmon: (lm75) cleanup/reorg
hwmon: (adt7473) clarify an awkward bit of code
hwmon: (adt7473) Remove unused defines
hwmon: (dme1737) fix voltage scaling
hwmon: (dme1737) probe all addresses
hwmon: (dme1737) demacrofy for readability
commit 93769f58078e2a066b56217cae1e343ac5a6b78c
Author: Jens Axboe <jens.axboe at oracle.com>
Date: Fri Aug 1 20:32:31 2008 +0200
md: the bitmap code needs to use blk_plug_device_unlocked()
It doesn't hold the queue lock, so it's both racey on the queue flags
and thus spews a warning.
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 6c5e0c4d518a37e1d5d794c14433e80284415079
Author: Jens Axboe <jens.axboe at oracle.com>
Date: Fri Aug 1 20:31:32 2008 +0200
block: add a blk_plug_device_unlocked() that grabs the queue lock
blk_plug_device() must be called with the queue lock held, so callers
often just grab and release the lock for that purpose. Add a helper
that does just that.
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 623fa579e61f250c1913c70257ef3a753820bb68
Merge: d65f5c5803d9cd6fa0b540a0dddf956be671bc36 e4c094a595ba8ea402e6b2153f7bbf6ef039eea0
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Aug 1 11:29:54 2008 -0700
Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6:
[MTD] [NAND] drivers/mtd/nand/nandsim.c: fix printk warnings
[MTD] [NAND] Blackfin NFC Driver: Cleanup the error exit path of bf5xx_nand_probe function
[MTD] [NAND] Blackfin NFC Driver: use standard dev_err() rather than printk()
[MTD] [NAND] Blackfin NFC Driver: enable Blackfin nand HWECC support by default
[MTD] [NAND] Blackfin NFC Driver: add proper devinit/devexit markings to probe/remove functions
[MTD] [NAND] Blackfin NFC Driver: add support for the ECC layout the Blackfin bootrom uses
[MTD] [NAND] Blackfin NFC Driver: fix bug - hw ecc calc by making sure we extract 11 bits from each register instead of 10
[MTD] [NAND] Blackfin NFC Driver: fix bug - do not clobber the status from the first 256 bytes if operating on 512 pages
[MTD] [NAND] diskonchip.c fix sparse endian warnings
[MTD] [NAND] drivers/mtd/nand/nandsim.c needs div64.h
[JFFS2] Fix allocation of summary buffer
Fix rename of at91_nand -> atmel_nand
[MTD] [NOR] drivers/mtd/chips/jedec_probe.c: fix Am29DL800BB device ID
[MTD] MTD_DEBUG always does compile-time typechecks
[MTD] DataFlash: bugfix, binary page sizes now handled
[MTD] [NAND] fsl_elbc_nand.c: fix printk warning
[MTD] [NAND] nandsim: support random page read command
[MTD] [NAND] fix subpage read for small page NAND
commit d65f5c5803d9cd6fa0b540a0dddf956be671bc36
Merge: a8086ad803fc4d251edb9a49838bf99c7fdfb44f 8d66bf5481002b0960aa49aed0987c73f5d7816c
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Aug 1 11:26:51 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
[PATCH] pass struct path * to do_add_mount()
[PATCH] switch mtd and dm-table to lookup_bdev()
[patch 3/4] vfs: remove unused nameidata argument of may_create()
[PATCH] devpts: switch to IDA
[PATCH 2/2] proc: switch inode number allocation to IDA
[PATCH 1/2] proc: fix inode number bogorithmetic
[PATCH] fix bdev leak in block_dev.c do_open()
[PATCH] fix races and leaks in vfs_quota_on() users
[PATCH] clean dup2() up a bit
[PATCH] merge locate_fd() and get_unused_fd()
[PATCH] ipv4_static_sysctl_init() should be under CONFIG_SYSCTL
Re: BUG at security/selinux/avc.c:883 (was: Re: linux-next: Tree
commit a8086ad803fc4d251edb9a49838bf99c7fdfb44f
Merge: b2bbf43e60073f70a3c8663513710fa8d03a33f8 20c6aaa39ab735c7ed78e4e5a214d250efae0a6e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Aug 1 11:23:09 2008 -0700
Merge branch 'audit.b54' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current
* 'audit.b54' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
[PATCH] Fix the bug of using AUDIT_STATUS_RATE_LIMIT when set fail, no error output.
[PATCH] Fix the kernel panic of audit_filter_task when key field is set
Re: [PATCH] the loginuid field should be output in all AUDIT_CONFIG_CHANGE audit messages
kernel/audit.c control character detection is off-by-one
[PATCH] Audit: Collect signal info when SIGUSR2 is sent to auditd
commit b2bbf43e60073f70a3c8663513710fa8d03a33f8
Merge: 561b35b341b1aeeab486affe1ede0ee6640ce33b e491d230fd398bb730e3c2dd734c5447463b9d38
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Aug 1 11:22:45 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
au1xmmc: raise segment size limit.
mmc_block: use proper sg iterators
mmc: properly iterate over sg list in debug check
mmc_test: Revert "mmc_test: test oversized sg lists"
sdhci: check correct return value
sdhci: disable DMA for req, not completely
sdhci: handle bug in JMB38x for sizes < 4 bytes
commit 561b35b341b1aeeab486affe1ede0ee6640ce33b
Merge: a7c2a10dab4e5122cbcfa3d5e9d589a52ccc2287 0eb5d5ab3ec99bfd22ff16797d95835369ffb25b
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Aug 1 10:56:40 2008 -0700
Merge branch 'reg-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
* 'reg-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
regulator: TI bq24022 Li-Ion Charger driver
regulator: maintainers - add maintainers for regulator framework.
regulator: documentation - ABI
regulator: documentation - machine
regulator: documentation - regulator driver
regulator: documentation - consumer interface
regulator: documentation - overview
regulator: core kbuild files
regulator: regulator test harness
regulator: add support for fixed regulators.
regulator: regulator framework core
regulator: fixed regulator interface
regulator: machine driver interface
regulator: regulator driver interface
regulator: consumer device interface
commit a7c2a10dab4e5122cbcfa3d5e9d589a52ccc2287
Merge: b14f7fb5aa2f4289e3a9fa8d7d92417ec8607498 383795c206946777d87ed5f6d61d6659110f9344
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Aug 1 10:55:57 2008 -0700
Merge branch 'hotfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'hotfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
SELinux: /proc/mounts should show what it can
commit b14f7fb5aa2f4289e3a9fa8d7d92417ec8607498
Merge: 00e9028a95fb8a4d79f2fb695a853f33ea7d3b57 9fec6060d9e48ed7db0dac0e16d0f0f0e615b7f6
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Aug 1 10:55:07 2008 -0700
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6:
power_supply: Sharp SL-6000 (tosa) batteries support
power_supply: fix up CHARGE_COUNTER output to be more precise
power_supply: add CHARGE_COUNTER property and olpc_battery support for it
power_supply: bump EC version check that we refuse to run with in olpc_battery
power_supply: cleanup of the OLPC battery driver
power_supply: add eeprom dump file to olpc_battery's sysfs
power_supply: Support serial number in olpc_battery
commit 00e9028a95fb8a4d79f2fb695a853f33ea7d3b57
Merge: 57b1494d2ba544c62673234da6115c21fac27ffc 7cb93181629c613ee2b8f4ffe3446f8003074842
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Aug 1 10:53:43 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (28 commits)
mm/hugetlb.c must #include <asm/io.h>
video: Fix up hp6xx driver build regressions.
sh: defconfig updates.
sh: Kill off stray mach-rsk7203 reference.
serial: sh-sci: Fix up SH7760/SH7780/SH7785 early printk regression.
sh: Move out individual boards without mach groups.
sh: Make sure AT_SYSINFO_EHDR is exposed to userspace in asm/auxvec.h.
sh: Allow SH-3 and SH-5 to use common headers.
sh: Provide common CPU headers, prune the SH-2 and SH-2A directories.
sh/maple: clean maple bus code
sh: More header path fixups for mach dir refactoring.
sh: Move out the solution engine headers to arch/sh/include/mach-se/
sh: I2C fix for AP325RXA and Migo-R
sh: Shuffle the board directories in to mach groups.
sh: dma-sh: Fix up dreamcast dma.h mach path.
sh: Switch KBUILD_DEFCONFIG to shx3_defconfig.
sh: Add ARCH_DEFCONFIG entries for sh and sh64.
sh: Fix compile error of Solution Engine
sh: Proper __put_user_asm() size mismatch fix.
sh: Stub in a dummy ENTRY_OFFSET for uImage offset calculation.
...
commit 57b1494d2ba544c62673234da6115c21fac27ffc
Merge: 9fe3b64be3dc8313e9fa87255f169c608d074cbd 8978b74253280d59e97cf49a3ec2c0cbccd5b801
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Aug 1 10:28:17 2008 -0700
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
generic, x86: fix add iommu_num_pages helper function
x86: remove stray <6> in BogoMIPS printk
x86: move dma32_reserve_bootmem() after reserve_crashkernel()
commit 9fe3b64be3dc8313e9fa87255f169c608d074cbd
Merge: 8b6d8c592fa7b8bfb1218447a273314c13a67e8a ab4227cb2d936886069ef1056c02500d05beb15d
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Aug 1 10:27:10 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] qeth: avoid use of include/asm-s390
[S390] dont use kthread for smp_rescan_cpus().
[S390] virtio console: fix section mismatch warning.
[S390] cio: Include linux/string.h in schid.h.
[S390] qdio: fix section mismatch bug.
[S390] stp: fix section mismatch warning.
[S390] Remove diag 0x260 call from memory detection.
[S390] qdio: make sure qdr is aligned to page size
[S390] Add support for memory hot-remove.
[S390] Wire up new syscalls.
[S390] cio: Memory allocation for idset changed.
[S390] qeth: preallocated qeth header for hiper socket
[S390] Optimize storage key operations for anon pages
[S390] nohz/sclp: disable timer on synchronous waits.
[S390] ipl: Reboot from alternate device does not work when booting from file
[S390] dasd: Add support for enhanced VM UID
[S390] Remove last P390 trace.
commit 7f30491ccd28627742e37899453ae20e3da8e18f
Author: Tony Luck <tony.luck at intel.com>
Date: Fri Aug 1 10:13:32 2008 -0700
[IA64] Move include/asm-ia64 to arch/ia64/include/asm
After moving the the include files there were a few clean-ups:
1) Some files used #include <asm-ia64/xyz.h>, changed to <asm/xyz.h>
2) Some comments alerted maintainers to look at various header files to
make matching updates if certain code were to be changed. Updated these
comments to use the new include paths.
3) Some header files mentioned their own names in initial comments. Just
deleted these self references.
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit e491d230fd398bb730e3c2dd734c5447463b9d38
Author: Manuel Lauss <mano at roarinelk.homelinux.net>
Date: Tue Jul 29 10:10:49 2008 +0200
au1xmmc: raise segment size limit.
Raise the DMA block size limit from 2048 bytes to the maximum supported
by the DMA controllers on the chip (64KB on Au1100, 4MB on Au1200).
This gives a very small performance boost and apparently fixes an oops
when MMC-DMA and network traffic are active at the same time.
Signed-off-by: Manuel Lauss <mano at roarinelk.homelinux.net>
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit b41e9c7b8e14ea57aa0fc05fd63a0de0e935d58d
Author: Pierre Ossman <drzeus at drzeus.cx>
Date: Tue Jul 29 01:23:24 2008 +0200
mmc_block: use proper sg iterators
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit a84756c5735f28bf000617f18734a9e94426386a
Author: Pierre Ossman <drzeus at drzeus.cx>
Date: Tue Jul 29 01:09:37 2008 +0200
mmc: properly iterate over sg list in debug check
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit b7ac2cf1cdf346b34cbc2104d386a9d29d12aa4c
Author: Pierre Ossman <drzeus at drzeus.cx>
Date: Tue Jul 29 01:05:22 2008 +0200
mmc_test: Revert "mmc_test: test oversized sg lists"
This reverts commit 48b5352ea1891455eb8e824cf7d92f66931a090f. Oversized
sg lists are not allowed anymore, and the core even checks for them in
debug mode, so this test is entirely incorrect.
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit 980167b7fb20fb181766218b4771fc7420a7bbb4
Author: Pierre Ossman <drzeus at drzeus.cx>
Date: Tue Jul 29 00:53:20 2008 +0200
sdhci: check correct return value
Fix a copy-and-paste error.
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit ebd6d357848edb8709dd9bed4b93834d1b4d7044
Author: Pierre Ossman <drzeus at drzeus.cx>
Date: Tue Jul 29 00:45:51 2008 +0200
sdhci: disable DMA for req, not completely
The wrong flag was manipulated when an invalid sg list was given, turning
off DMA on the next (and all subsequent) request instead of the current
one.
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit 4a3cba32cb514168bb2516c045b178e6660421d1
Author: Pierre Ossman <drzeus at drzeus.cx>
Date: Tue Jul 29 00:11:16 2008 +0200
sdhci: handle bug in JMB38x for sizes < 4 bytes
Signed-off-by: Pierre Ossman <drzeus at drzeus.cx>
commit 20c6aaa39ab735c7ed78e4e5a214d250efae0a6e
Author: zhangxiliang <zhangxiliang at cn.fujitsu.com>
Date: Thu Jul 31 10:11:19 2008 +0800
[PATCH] Fix the bug of using AUDIT_STATUS_RATE_LIMIT when set fail, no error output.
When the "status_get->mask" is "AUDIT_STATUS_RATE_LIMIT || AUDIT_STATUS_BACKLOG_LIMIT".
If "audit_set_rate_limit" fails and "audit_set_backlog_limit" succeeds, the "err" value
will be greater than or equal to 0. It will miss the failure of rate set.
Signed-off-by: Zhang Xiliang <zhangxiliang at cn.fujitsu.com>
Acked-by: Eric Paris <eparis at redhat.com>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 980dfb0db340b95094732d78b55311f2c539c1af
Author: zhangxiliang <zhangxiliang at cn.fujitsu.com>
Date: Fri Aug 1 19:15:47 2008 +0800
[PATCH] Fix the kernel panic of audit_filter_task when key field is set
When calling audit_filter_task(), it calls audit_filter_rules() with audit_context is NULL.
If the key field is set, the result in audit_filter_rules() will be set to 1 and
ctx->filterkey will be set to key.
But the ctx is NULL in this condition, so kernel will panic.
Signed-off-by: Zhang Xiliang <zhangxiliang at cn.fujitsu.com>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 036bbf76ad9f83781590623111b80ba0b82930ac
Author: zhangxiliang <zhangxiliang at cn.fujitsu.com>
Date: Fri Aug 1 09:47:01 2008 +0800
Re: [PATCH] the loginuid field should be output in all AUDIT_CONFIG_CHANGE audit messages
> shouldn't these be using the "audit_get_loginuid(current)" and if we
> are going to output loginuid we also should be outputting sessionid
Thanks for your detailed explanation.
I have made a new patch for outputing "loginuid" and "sessionid" by audit_get_loginuid(current) and audit_get_sessionid(current).
If there are some deficiencies, please give me your indication.
Signed-off-by: Zhang Xiliang <zhangxiliang at cn.fujitsu.com>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 1d6c9649e236caa2e93e3647256216e57172b011
Author: Vesa-Matti J Kari <vmkari at cc.helsinki.fi>
Date: Wed Jul 23 00:06:13 2008 +0300
kernel/audit.c control character detection is off-by-one
Hello,
According to my understanding there is an off-by-one bug in the
function:
audit_string_contains_control()
in:
kernel/audit.c
Patch is included.
I do not know from how many places the function is called from, but for
example, SELinux Access Vector Cache tries to log untrusted filenames via
call path:
avc_audit()
audit_log_untrustedstring()
audit_log_n_untrustedstring()
audit_string_contains_control()
If audit_string_contains_control() detects control characters, then the
string is hex-encoded. But the hex=0x7f dec=127, DEL-character, is not
detected.
I guess this could have at least some minor security implications, since a
user can create a filename with 0x7f in it, causing logged filename to
possibly look different when someone reads it on the terminal.
Signed-off-by: Vesa-Matti Kari <vmkari at cc.helsinki.fi>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit ee1d315663ee0b494898f813a266d6244b263b4f
Author: Eric Paris <eparis at redhat.com>
Date: Mon Jul 7 10:49:45 2008 -0400
[PATCH] Audit: Collect signal info when SIGUSR2 is sent to auditd
Makes the kernel audit subsystem collect information about the sending
process when that process sends SIGUSR2 to the userspace audit daemon.
SIGUSR2 is a new interesting signal to auditd telling auditd that it
should try to start logging to disk again and the error condition which
caused it to stop logging to disk (usually out of space) has been
rectified.
Signed-off-by: Eric Paris <eparis at redhat.com>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 8d66bf5481002b0960aa49aed0987c73f5d7816c
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Fri Aug 1 09:05:54 2008 -0400
[PATCH] pass struct path * to do_add_mount()
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit d5686b444ff3f72808d2b3fbd58672a86cdf38e7
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Fri Aug 1 05:00:11 2008 -0400
[PATCH] switch mtd and dm-table to lookup_bdev()
No need to open-code it...
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit a95164d979c5ca061f15bcaadc829c146693d4d9
Author: Miklos Szeredi <mszeredi at suse.cz>
Date: Wed Jul 30 15:08:48 2008 +0200
[patch 3/4] vfs: remove unused nameidata argument of may_create()
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 7ee7c12b7121cd49d528de219e4ffd5459657998
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date: Sat Jul 26 11:42:16 2008 +0400
[PATCH] devpts: switch to IDA
Devpts code wants just numbers for tty indexes.
Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 9a18540915faaaadd7f71c16fa877a0c19675923
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date: Sat Jul 26 11:21:37 2008 +0400
[PATCH 2/2] proc: switch inode number allocation to IDA
proc doesn't use "associate pointer with id" feature of IDR, so switch
to IDA.
NOTE, NOTE, NOTE:
Do not apply if release_inode_number() still mantions MAX_ID_MASK!
Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 67935df49dae836fa86621861979fafdfd37ae59
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date: Sat Jul 26 11:18:28 2008 +0400
[PATCH 1/2] proc: fix inode number bogorithmetic
Id which proc gets from IDR for inode number and id which proc removes
from IDR do not match. E.g. 0x11a transforms into 0x8000011a.
Which stayed unnoticed for a long time because, surprise, idr_remove()
masks out that high bit before doing anything.
All of this due to "| ~MAX_ID_MASK" in release_inode_number().
I still don't understand how it's supposed to work, because "| ~MASK"
is not an inversion for "& MAX" operation.
So, use just one nice, working addition. Make start offset unsigned int,
while I'm at it. It's longness is not used anywhere.
Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 8266602033d6adc6d10cb8811c1fd694767909b0
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Fri Aug 1 05:32:04 2008 -0400
[PATCH] fix bdev leak in block_dev.c do_open()
Callers expect it to drop reference to bdev on all failure exits.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 77e69dac3cefacee939cb107ae9cd520a62338e0
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Fri Aug 1 04:29:18 2008 -0400
[PATCH] fix races and leaks in vfs_quota_on() users
* new helper: vfs_quota_on_path(); equivalent of vfs_quota_on() sans the
pathname resolution.
* callers of vfs_quota_on() that do their own pathname resolution and
checks based on it are switched to vfs_quota_on_path(); that way we
avoid the races.
* reiserfs leaked dentry/vfsmount references on several failure exits.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 1b7e190b4764ea3ca1080404dd593eae5230d2b3
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Wed Jul 30 06:18:03 2008 -0400
[PATCH] clean dup2() up a bit
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit 1027abe8827b47f7e9c4ed6514fde3d44f79963c
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Wed Jul 30 04:13:04 2008 -0400
[PATCH] merge locate_fd() and get_unused_fd()
New primitive: alloc_fd(start, flags). get_unused_fd() and
get_unused_fd_flags() become wrappers on top of it.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit a1bc6eb4b499ae67ada9a01660010580b6569403
Author: Al Viro <viro at zeniv.linux.org.uk>
Date: Wed Jul 30 06:32:52 2008 -0400
[PATCH] ipv4_static_sysctl_init() should be under CONFIG_SYSCTL
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit f418b006079ce537daf9436215f1d2a47e451602
Author: Stephen Smalley <sds at tycho.nsa.gov>
Date: Mon Jul 28 13:32:38 2008 -0400
Re: BUG at security/selinux/avc.c:883 (was: Re: linux-next: Tree
for July 17: early crash on x86-64)
SELinux needs MAY_APPEND to be passed down to the security hook.
Otherwise, we get permission denials when only append permission is
granted by policy even if the opening process specified O_APPEND.
Shows up as a regression in the ltp selinux testsuite, fixed by
this patch.
Signed-off-by: Stephen Smalley <sds at tycho.nsa.gov>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit e4c094a595ba8ea402e6b2153f7bbf6ef039eea0
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Wed Jul 30 12:35:04 2008 -0700
[MTD] [NAND] drivers/mtd/nand/nandsim.c: fix printk warnings
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
commit 4f0ca70e52b67f41287d853f0d572dafa875e485
Author: Bryan Wu <cooloney at kernel.org>
Date: Wed Jul 30 12:35:04 2008 -0700
[MTD] [NAND] Blackfin NFC Driver: Cleanup the error exit path of bf5xx_nand_probe function
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Cc: Mike Frysinger <vapier.adi at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
commit 0ee002b041cb45ab3cc5384b86271d41ccf90fe1
Author: Mike Frysinger <vapier.adi at gmail.com>
Date: Wed Jul 30 12:35:03 2008 -0700
[MTD] [NAND] Blackfin NFC Driver: use standard dev_err() rather than printk()
Signed-off-by: Mike Frysinger <vapier.adi at gmail.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
commit a0dd20184becf5c90996d9ee0bb69426fe63581a
Author: Mike Frysinger <vapier.adi at gmail.com>
Date: Wed Jul 30 12:35:02 2008 -0700
[MTD] [NAND] Blackfin NFC Driver: enable Blackfin nand HWECC support by default
Signed-off-by: Mike Frysinger <vapier.adi at gmail.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
commit 2445af3853928bf3ee7960e09f548a1b07924091
Author: Mike Frysinger <vapier.adi at gmail.com>
Date: Wed Jul 30 12:35:02 2008 -0700
[MTD] [NAND] Blackfin NFC Driver: add proper devinit/devexit markings to probe/remove functions
Signed-off-by: Mike Frysinger <vapier.adi at gmail.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
commit fcb90ba7e9ba9a17ca5103be3f3ae3a446dadc14
Author: Mike Frysinger <vapier.adi at gmail.com>
Date: Wed Jul 30 12:35:01 2008 -0700
[MTD] [NAND] Blackfin NFC Driver: add support for the ECC layout the Blackfin bootrom uses
Signed-off-by: Mike Frysinger <vapier.adi at gmail.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
commit cf840392e83914b9fcdbce8a8a2bc17a84cf0353
Author: Mike Frysinger <vapier.adi at gmail.com>
Date: Wed Jul 30 12:35:00 2008 -0700
[MTD] [NAND] Blackfin NFC Driver: fix bug - hw ecc calc by making sure we extract 11 bits from each register instead of 10
Signed-off-by: Mike Frysinger <vapier.adi at gmail.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
commit e274f025e2caaadc1a6dd41adc9c9a19be075110
Author: Mike Frysinger <vapier.adi at gmail.com>
Date: Wed Jul 30 12:34:59 2008 -0700
[MTD] [NAND] Blackfin NFC Driver: fix bug - do not clobber the status from the first 256 bytes if operating on 512 pages
Singed-off-by: Mike Frysinger <vapier.adi at gmail.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
commit ab4227cb2d936886069ef1056c02500d05beb15d
Author: Martin Schwidefsky <schwidefsky at de.ibm.com>
Date: Fri Aug 1 16:39:24 2008 +0200
[S390] qeth: avoid use of include/asm-s390
The planned move of include/asm-s390 to arch/s390/include/asm
requires that all includes for asm headers use include/asm and
not include/asm-s390.
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit fc7e1e4b1ca69109d0f694e47ef2328dcb0ebe6e
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Fri Aug 1 16:39:23 2008 +0200
[S390] dont use kthread for smp_rescan_cpus().
Since git commit 3da1c84c00c7e5fa8348336bd8c342f9128b0f14
"workqueues: make get_online_cpus() useable for work->func()"
it is safe to call get_online_cpus() from workqueue context.
So remove the kthread workaround again.
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 26f746f3e3bb44b37a894318aa8e808b914ad663
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Fri Aug 1 16:39:22 2008 +0200
[S390] virtio console: fix section mismatch warning.
Fix these two false positive warnings:
WARNING: vmlinux.o(.text+0x2e1cc4): Section mismatch in reference from the function s390_virtio_console_init() to the function .init.text:early_put_chars()
The function s390_virtio_console_init() references
the function __init early_put_chars().
This is often because s390_virtio_console_init lacks a __init
annotation or the annotation of early_put_chars is wrong.
WARNING: vmlinux.o(.text+0x2e1cd0): Section mismatch in reference from the function s390_virtio_console_init() to the function .init.text:virtio_cons_early_init()
The function s390_virtio_console_init() references
the function __init virtio_cons_early_init().
This is often because s390_virtio_console_init lacks a __init
annotation or the annotation of virtio_cons_early_init is wrong.
Cc: Christian Borntraeger <borntraeger 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 1378ee9b67298176edbcec0ab87b38e913d76ab9
Author: Cornelia Huck <cornelia.huck at de.ibm.com>
Date: Fri Aug 1 16:39:21 2008 +0200
[S390] cio: Include linux/string.h in schid.h.
schid.h needs string.h for memset and memcmp.
Signed-off-by: Cornelia Huck <cornelia.huck at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 3f1934bc1a0dcc2b7c31c8fd4f41ea2dd6522c3e
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Fri Aug 1 16:39:20 2008 +0200
[S390] qdio: fix section mismatch bug.
Fix the two section mismatch warnings below.
This fixes two real bugs since the code which has __exit annotations
may already be gone when it is called.
WARNING: vmlinux.o(.init.text+0x1cc4a): Section mismatch in reference from the function init_QDIO() to the function .exit.text:qdio_setup_exit()
The function __init init_QDIO() references
a function __exit qdio_setup_exit().
This is often seen when error handling in the init function
uses functionality in the exit path.
The fix is often to remove the __exit annotation of
qdio_setup_exit() so it may be used outside an exit section.
WARNING: vmlinux.o(.init.text+0x1cc7a): Section mismatch in reference from the function init_QDIO() to the function .exit.text:qdio_remove_perf_stats()
The function __init init_QDIO() references
a function __exit qdio_remove_perf_stats().
This is often seen when error handling in the init function
uses functionality in the exit path.
The fix is often to remove the __exit annotation of
qdio_remove_perf_stats() so it may be used outside an exit section.
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 8f8470032570988af2eeff520ca01a32fd908b2b
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Fri Aug 1 16:39:19 2008 +0200
[S390] stp: fix section mismatch warning.
Fix these two (false positive) warnings by adding an __init annoation:
WARNING: vmlinux.o(.text+0x7e6a): Section mismatch in reference from the function stp_reset() to the function .init.text:__alloc_bootmem()
The function stp_reset() references
the function __init __alloc_bootmem().
This is often because stp_reset lacks a __init
annotation or the annotation of __alloc_bootmem is wrong.
WARNING: vmlinux.o(.text+0x7ece): Section mismatch in reference from the function stp_reset() to the function .init.text:free_bootmem()
The function stp_reset() references
the function __init free_bootmem().
This is often because stp_reset lacks a __init
annotation or the annotation of free_bootmem is wrong.
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit d918fe2bd72830dfbe8ca2bb30d49930d1356e6d
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Fri Aug 1 16:39:18 2008 +0200
[S390] Remove diag 0x260 call from memory detection.
The result of the diag 0x260 call is not always what one would expect.
So just remove it.
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 3b8e3004aea95c687e8991583e7b150ec1416ff3
Author: Jan Glauber <jang at linux.vnet.ibm.com>
Date: Fri Aug 1 16:39:17 2008 +0200
[S390] qdio: make sure qdr is aligned to page size
kzalloc does not guarantee the required alignment of qdr to page size,
use get_zeroed_page instead.
Signed-off-by: Jan Glauber <jang at linux.vnet.ibm.com>
commit 7e9238fbc10373effc2c3b0b516b0bdc8fefc27b
Author: Gerald Schaefer <gerald.schaefer at de.ibm.com>
Date: Fri Aug 1 16:39:16 2008 +0200
[S390] Add support for memory hot-remove.
This patch enables memory hot-remove on s390.
Signed-off-by: Gerald Schaefer <gerald.schaefer at de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 519620cc3d723d41522191ebd150fba4a3790296
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Fri Aug 1 16:39:15 2008 +0200
[S390] Wire up new syscalls.
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 883e512c99fc398d1b2b5e8e92b6bacff2551756
Author: Michael Ernst <mernst at de.ibm.com>
Date: Fri Aug 1 16:39:14 2008 +0200
[S390] cio: Memory allocation for idset changed.
Memory allocation for the quite huge idset changed from
kzalloc to vmalloc.
Signed-off-by: Michael Ernst <mernst at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 683d718a893575a88c551ad71ea2c382eedbf67e
Author: Frank Blaschka <frank.blaschka at de.ibm.com>
Date: Fri Aug 1 16:39:13 2008 +0200
[S390] qeth: preallocated qeth header for hiper socket
For hiper socket devices this patch will economize the reallocation
of the tx skb data segment by allocating separate memory for the qdio
transport information (qeth header).
Signed-off-by: Frank Blaschka <frank.blaschka at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit a4b526b3ba6353cd89a38e41da48ed83b0ead16f
Author: Martin Schwidefsky <schwidefsky at de.ibm.com>
Date: Fri Aug 1 16:39:12 2008 +0200
[S390] Optimize storage key operations for anon pages
For anonymous pages without a swap cache backing the check in
page_remove_rmap for the physical dirty bit in page_remove_rmap is
unnecessary. The instructions that are used to check and reset the dirty
bit are expensive. Removing the check noticably speeds up process exit.
In addition the clearing of the dirty bit in __SetPageUptodate is
pointless as well. With these two changes there is no storage key
operation for an anonymous page anymore if it does not hit the swap
space.
The micro benchmark which repeatedly executes an empty shell script
gets about 5% faster.
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 934b2857cc576ae53c92a66e63fce7ddcfa74691
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Fri Aug 1 16:39:11 2008 +0200
[S390] nohz/sclp: disable timer on synchronous waits.
sclp_sync_wait wait synchronously for an sclp interrupt and disables
timer interrupts. However on the irq enter paths there is an extra
check if a timer interrupt would be due and calls the timer callback.
This would schedule softirqs in the wrong context.
So introduce local_tick_enable/disable which prevents this.
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 3a95e8eb34f595a0144adb6e5513d456319bd8a5
Author: Michael Holzheu <holzheu at linux.vnet.ibm.com>
Date: Fri Aug 1 16:39:10 2008 +0200
[S390] ipl: Reboot from alternate device does not work when booting from file
During startup we check if diag308 works using diag 308 subcode 6,
which stores the actual ipl information. This fails with rc = 0x102, if
the system has been ipled from the HMC using load from CD or load from file.
In the case of rc = 0x102 we have to assume that diag 308 is working,
since it still can be used to ipl from an alternative device.
Signed-off-by: Michael Holzheu <holzheu at linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 4abb08c24b5fa7b6ad0807c07077f0f216f6788b
Author: Stefan Weinhuber <wein at de.ibm.com>
Date: Fri Aug 1 16:39:09 2008 +0200
[S390] dasd: Add support for enhanced VM UID
When z/VM provides two virtual devices (minidisks) that reside on the
same real device, both will receive the configuration data from the
real device and thus get the same uid. To fix this problem, z/VM
provides an additional configuration data record that allows to
distinguish between minidisks.
z/VM APAR VM64273 needs be installed so this fix has an effect.
Signed-off-by: Stefan Weinhuber <wein at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit c2bb4e5d497823437f0a11d342024ccdc6ff5b0d
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Fri Aug 1 16:39:08 2008 +0200
[S390] Remove last P390 trace.
Seems like I forgot this hunk...
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 963724462a11668185dc67879ea8fe7590973322
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Wed Jul 30 12:34:57 2008 -0700
[MTD] [NAND] diskonchip.c fix sparse endian warnings
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Cc: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
commit fc1f397b2c7ef1c9bad58778e4041dfabf20c71c
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Wed Jul 30 12:34:56 2008 -0700
[MTD] [NAND] drivers/mtd/nand/nandsim.c needs div64.h
drivers/mtd/nand/nandsim.c: In function 'divide':
drivers/mtd/nand/nandsim.c:462: error: implicit declaration of function 'do_div'
Cc: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
commit 25fc999913839a45cbb48ac7872e67f7521e7ed9
Author: Jason Wessel <jason.wessel at windriver.com>
Date: Fri Aug 1 08:39:35 2008 -0500
kgdb: fix gdb serial thread queries
The command "info threads" did not work correctly with kgdb. It would
result in a silent kernel hang if used.
This patach addresses several problems.
- Fix use of deprecated NR_CPUS
- Fix kgdb to not walk linearly through the pid space
- Correctly implement shadow pids
- Change the threads per query to a #define
- Fix kgdb_hex2long to work with negated values
The threads 0 and -1 are reserved to represent the current task. That
means that CPU 0 will start with a shadow thread id of -2, and CPU 1
will have a shadow thread id of -3, etc...
From the debugger you can switch to a shadow thread to see what one of
the other cpus was doing, however it is not possible to execute run
control operations on any other cpu execept the cpu executing the
kgdb_handle_exception().
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
commit a9b60bf4c29e07a5a2f26a6f74937972fee9b58b
Author: Jason Wessel <jason.wessel at windriver.com>
Date: Fri Aug 1 08:39:34 2008 -0500
kgdb: fix kgdb_validate_break_address to perform a mem write
A regression to the kgdb core was found in the case of using the
CONFIG_DEBUG_RODATA kernel option. When this option is on, a breakpoint
cannot be written into any readonly memory page. When an external
debugger requests a breakpoint to get set, the
kgdb_validate_break_address() was only checking to see if the address
to place the breakpoint was readable and lacked a write check.
This patch changes the validate routine to try reading (via the
breakpoint set request) and also to try immediately writing the break
point. If either fails, an error is correctly returned and the
debugger behaves correctly. Then an end user can make the
descision to use hardware breakpoints.
Also update the documentation to reflect that using
CONFIG_DEBUG_RODATA will inhibit the use of software breakpoints.
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
commit 5f5ddfb3605d2a4f555a7ff034859e623eafcd27
Author: Jason Wessel <jason.wessel at windriver.com>
Date: Fri Aug 1 08:39:34 2008 -0500
kgdb: remove the requirement for CONFIG_FRAME_POINTER
There is no technical reason that the kgdb core requires frame
pointers. It is up to the end user of KGDB to decide if they need
them or not.
[ anemo at mba.ocn.ne.jp: removed frame pointers on mips ]
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
commit b7600dba6d4fbf3897e517b322d006986cce831a
Author: David Woodhouse <David.Woodhouse at intel.com>
Date: Fri Aug 1 10:07:51 2008 +0100
[JFFS2] Fix allocation of summary buffer
We can't use vmalloc for the buffer we use for writing summaries,
because some drivers may want to DMA from it. So limit the size to 64KiB
and use kmalloc for it instead.
Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
commit f6ed6f78d46b43b6d908b39ed3322f7cda23f4a8
Author: Pieter du Preez <pdupreez at gmail.com>
Date: Fri Aug 1 10:06:40 2008 +0100
Fix rename of at91_nand -> atmel_nand
Structs called at91_nand_data where renamed to atmel_nand_data
and configs called *MTD_NAND_AT91* where renamed to
*MTD_NAND_ATMEL*. This was unfortunately not done consistently,
causing NAND chips not being initialised on several ARM boards.
I am aware that the author of the original change did not rename
MTD_NAND_AT91_BUSWIDTH to MTD_NAND_ATMEL_BUSWIDTH, for example.
All *MTD_NAND_AT91* where renamed to *MTD_NAND_ATMEL* in order
to keep naming consistency.
This patch was only tested on a MACH_SAM9_L9260, as this is the
only ARM board I have to my disposal.
Before this patch:
$ git-ls-files |xargs grep atmel_nand |wc -l
105
$ git-ls-files |xargs grep at91_nand |wc -l
4
$ git-ls-files |xargs grep MTD_NAND_ATMEL |wc -l
8
$ git-ls-files |xargs grep MTD_NAND_AT91 |wc -l
47
After this patch:
$ git-ls-files |xargs grep atmel_nand |wc -l
109
$ git-ls-files |xargs grep at91_nand |wc -l
0
$ git-ls-files |xargs grep MTD_NAND_ATMEL |wc -l
55
$ git-ls-files |xargs grep MTD_NAND_AT91 |wc -l
0
Signed-off-by: Pieter du Preez <pdupreez at gmail.com>
Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
commit 00b1304c4ca81dd893973cc620b87a5c3ff3f660
Author: Adam Langley <agl at imperialviolet.org>
Date: Thu Jul 31 21:36:07 2008 -0700
tcp: MD5: Fix IPv6 signatures
Reported by Stefanos Harhalakis; although 2.6.27-rc1 talks to itself using IPv6
TCP MD5 packets just fine, Stefanos noted that tcpdump claimed that the
signatures were invalid.
I broke this in 49a72dfb8814c2d65bd9f8c9c6daf6395a1ec58d ("tcp: Fix MD5
signatures for non-linear skbs"), it was just a typo.
Note that tcpdump will still sometimes claim that the signatures are incorrect.
A patch to tcpdump has been submitted for this[1].
[1] http://tinyurl.com/6a4fl2
Signed-off-by: Adam Langley <agl at imperialviolet.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 4a7b61d23505854dff7d04cc11944566cffdd0ee
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Thu Jul 31 20:52:08 2008 -0700
skbuff: add missing kernel-doc for do_not_encrypt
Add missing kernel-doc notation to sk_buff:
Warning(linux-2.6.27-rc1-git2//include/linux/skbuff.h:345): No description found for parameter 'do_not_encrypt'
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 8a9204db665365354b349ed5b0bc054f0433a2a4
Author: Ingo Molnar <mingo at elte.hu>
Date: Thu Jul 31 20:51:22 2008 -0700
net/ipv4/route.c: fix build error
fix:
net/ipv4/route.c: In function 'ip_static_sysctl_init':
net/ipv4/route.c:3225: error: 'ipv4_route_path' undeclared (first use in this function)
net/ipv4/route.c:3225: error: (Each undeclared identifier is reported only once
net/ipv4/route.c:3225: error: for each function it appears in.)
net/ipv4/route.c:3225: error: 'ipv4_route_table' undeclared (first use in this function)
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 47d715af0761012ab074a12b5b5959f0179eaa09
Author: Mark M. Hoffman <mhoffman at lightlink.com>
Date: Thu Jul 31 23:48:25 2008 -0400
hwmon: needs new maintainer
Signed-off-by: Mark M. Hoffman <mhoffman at lightlink.com>
commit 90b7e1120bb43ffaabb88d28f80a0c2e13167b15
Author: Adam Langley <agl at imperialviolet.org>
Date: Thu Jul 31 20:49:48 2008 -0700
tcp: MD5: Fix MD5 signatures on certain ACK packets
I noticed, looking at tcpdumps, that timewait ACKs were getting sent
with an incorrect MD5 signature when signatures were enabled.
I broke this in 49a72dfb8814c2d65bd9f8c9c6daf6395a1ec58d ("tcp: Fix
MD5 signatures for non-linear skbs"). I didn't take into account that
the skb passed to tcp_*_send_ack was the inbound packet, thus the
source and dest addresses need to be swapped when calculating the MD5
pseudoheader.
Signed-off-by: Adam Langley <agl at imperialviolet.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 77e2f14f71d68d05945f1d30ca55b5194d6ab1ce
Author: Wei Yongjun <yjwei at cn.fujitsu.com>
Date: Thu Jul 31 20:46:47 2008 -0700
ipv6: Fix ip6_xmit to send fragments if ipfragok is true
SCTP used ip6_xmit() to send fragments after received ICMP packet too
big message. But while send packet used ip6_xmit, the skb->local_df is
not initialized. So when skb if enter ip6_fragment(), the following
code will discard the skb.
ip6_fragment(...)
{
if (!skb->local_df) {
...
return -EMSGSIZE;
}
...
}
SCTP do the following step:
1. send packet ip6_xmit(skb, ipfragok=0)
2. received ICMP packet too big message
3. if PMTUD_ENABLE: ip6_xmit(skb, ipfragok=1)
This patch fixed the problem by set local_df if ipfragok is true.
Signed-off-by: Wei Yongjun <yjwei at cn.fujitsu.com>
Acked-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit bc4768eb081a67642c0c44c34ea597c273bdedcb
Author: Julius Volz <juliusv at google.com>
Date: Thu Jul 31 20:45:24 2008 -0700
ipvs: Move userspace definitions to include/linux/ip_vs.h
Current versions of ipvsadm include "/usr/src/linux/include/net/ip_vs.h"
directly. This file also contains kernel-only definitions. Normally, public
definitions should live in include/linux, so this patch moves the
definitions shared with userspace to a new file, "include/linux/ip_vs.h".
This also removes the unused NFC_IPVS_PROPERTY bitmask, which was once
used to point into skb->nfcache.
To make old ipvsadms still compile with this, the old header file includes
the new one.
Thanks to Dave Miller and Horms for noting/adding the missing Kbuild entry
for the new header file.
Signed-off-by: Julius Volz <juliusv at google.com>
Acked-by: Simon Horman <horms at verge.net.au>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 5f44759470f7248f74947a39cba339009d62052c
Author: Jean Delvare <khali at linux-fr.org>
Date: Wed Jun 25 09:10:30 2008 -0400
hwmon: (lm85) Simplify device initialization function
Clean up and simplify the device initialization function:
* Degrade error messages to warnings - what they really are.
* Stop warning about VxI mode, we don't really care.
* Drop comment about lack of limit initialization - that's the standard
way, all hardware monitoring drivers do that.
* Only read the configuration register once.
* Only write back to the configuration register if needed.
* Don't attempt to clear the lock bit, it locks itself to 1.
* Move the function to before it's called, so that we no longer need to
forware declare it.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Signed-off-by: Mark M. Hoffman <mhoffman at lightlink.com>
commit e89e22b23bceb3fbbcfb931ad17a564b7c1eaa55
Author: Jean Delvare <khali at linux-fr.org>
Date: Wed Jun 25 08:47:35 2008 -0400
hwmon: (lm85) Misc cleanups
Misc cleanups to the lm85 hardware monitoring driver:
* Mark constant arrays as const.
* Remove useless masks.
* Have lm85_write_value return void - nobody is checking the returned
value anyway and in some cases it was plain wrong.
* Remove useless initializations.
* Rename new_client to client in lm85_detect.
* Replace cascaded if/else with a switch/case in lm85_detect.
* Group similar loops in lm85_update_device.
* Remove legacy comments.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Acked-by: Juerg Haefliger <juergh at gmail.com>
Signed-off-by: Mark M. Hoffman <mhoffman at lightlink.com>
commit 7133e56f29030b13601d3399e20050053e560860
Author: Jean Delvare <khali at linux-fr.org>
Date: Sat Apr 12 19:56:35 2008 +0200
hwmon: (lm85) Don't write back cached values
In set_pwm_auto_pwm_minctl, we write cached register bits back to the
chip. This is a bad idea as we have no guarantee that the cache is
up-to-date. Better read a fresh register value from the chip, it's
safer and in fact it is also more simple.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Acked-by: Juerg Haefliger <juergh at gmail.com>
Signed-off-by: Mark M. Hoffman <mhoffman at lightlink.com>
commit dd1ac5384a08946a99e974bf5749d382e92ed3c0
Author: Jean Delvare <khali at linux-fr.org>
Date: Thu May 1 08:47:33 2008 +0200
hwmon: (lm85) Drop dead code
Drop a lot of useless register defines, conversion macros, data structure
members and update code. All these register values were read from the
device but nothing is done out of them, so this is all dead code in
practice.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Acked-by: Juerg Haefliger <juergh at gmail.com>
Signed-off-by: Mark M. Hoffman <mhoffman at lightlink.com>
commit 1f44809ac3d7a3fc977684dc3a95fa221f33fc15
Author: Jean Delvare <khali at linux-fr.org>
Date: Tue Apr 29 14:03:37 2008 +0200
hwmon: (lm85) Coding-style cleanups
Fix most style issues reported by checkpatch, including:
* Trailing, missing and extra whitespace
* Extra parentheses, curly braces and semi-colons
* Broken indentation
* Lines too long
I verified that the generated code is the same before and after
these changes.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Acked-by: Juerg Haefliger <juergh at gmail.com>
Signed-off-by: Mark M. Hoffman <mhoffman at lightlink.com>
commit 9ebd3d822efeca2e73565516a80373c76ce3fa12
Author: David Brownell <david-b at pacbell.net>
Date: Sat May 3 19:33:15 2008 -0700
hwmon: (lm75) add new-style driver binding
More LM75 updates:
- Teach the LM75 driver to use new-style driver binding:
* Create a second driver struct, using new-style driver binding
methods cribbed from the legacy code.
* Add a MODULE_DEVICE_TABLE (for "newER-style binding")
* The legacy probe logic delegates its work to this new code.
* The legacy driver now uses the name "lm75_legacy".
- More careful initialization. Chips are put into 9-bit mode so
the current interconversion routines will never fail.
- Save the original chip configuration, and restore it on exit.
(Among other things, this normally turns off the mode where
the chip is constantly sampling ... and thus saves power.)
So the new-style code should catch all chips that boards declare,
while the legacy code catches others. This particular coexistence
strategy may need some work yet ... legacy modes might best be set
up explicitly by some tool not unlike "sensors-detect". (Or else
completely eradicated...)
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Acked-by: Jean Delvare <khali at linux-fr.org>
Signed-off-by: Mark M. Hoffman <mhoffman at lightlink.com>
commit 01a52397e95a8532c59506691759dba9262d6be7
Author: David Brownell <david-b at pacbell.net>
Date: Mon Apr 21 12:10:53 2008 -0700
hwmon: (lm75) cleanup/reorg
Minor cleanup and reorg of the lm75 code.
- Kconfig provides a larger list of lm75-compatible chips
- A top comment now says what the driver does (!) ... as in, just
what sort of sensor is this??
- Section comments now delineate the various sections of the driver:
hwmon attributes, driver binding, register access, module glue.
One driver binding function moved out of the attribute section,
as did the driver struct itself.
- Minor tweaks to legacy probe logic: correct a comment, and
remove a pointless variable.
- Whitespace, linelength, and comment fixes.
This patch should include no functional changes. It's preparation
for adding new-style (driver model) I2C driver binding.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Acked-by: Jean Delvare <khali at linux-fr.org>
Acked-by: Laurent Pinchart <laurentp at cse-semaphore.com>
Signed-off-by: Mark M. Hoffman <mhoffman at lightlink.com>
commit 321c4138573da888ca30a387e9973f690c217e9e
Author: Mark M. Hoffman <mhoffman at lightlink.com>
Date: Mon May 26 15:09:36 2008 -0400
hwmon: (adt7473) clarify an awkward bit of code
Signed-off-by: Mark M. Hoffman <mhoffman at lightlink.com>
Acked-by: Jean Delvare <khali at linux-fr.org>
commit 9d3e19afd35907bf58b205096cd33e97df8fb6a5
Author: Jean Delvare <khali at linux-fr.org>
Date: Sat Apr 26 16:28:27 2008 +0200
hwmon: (adt7473) Remove unused defines
All the *_MAX_ADDR defines are never used, so remove them. The number
of registers of each type is already expressed by the *_COUNT defines.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Acked-by: Darrick J. Wong <djwong at us.ibm.com>
Signed-off-by: Mark M. Hoffman <mhoffman at lightlink.com>
commit f994fb23d3c63dffc8127f227f3e0c530e3e4fd6
Author: Juerg Haefliger <juergh at gmail.com>
Date: Tue Mar 25 21:49:15 2008 -0700
hwmon: (dme1737) fix voltage scaling
This patch fixes a voltage scaling issue for the sch311x device.
Signed-Off-By: Juerg Haefliger <juergh at gmail.com>
Acked-by: Jean Delvare <khali at linux-fr.org>
Signed-off-by: Mark M. Hoffman <mhoffman at lightlink.com>
commit 92430b6feb19aba043171ff3094535b598052901
Author: Juerg Haefliger <juergh at gmail.com>
Date: Thu Apr 3 21:34:19 2008 -0700
hwmon: (dme1737) probe all addresses
This patch adds a module load parameter to enable probing of
non-standard LPC addresses 0x162e and 0x164e when scanning for supported
ISA chips.
Signed-Off-By: Juerg Haefliger <juergh at gmail.com>
Acked-by: Jean Delvare <khali at linux-fr.org>
Signed-off-by: Mark M. Hoffman <mhoffman at lightlink.com>
commit 9b257714a3f6f5c3ea133c44d3442e2340734b65
Author: Juerg Haefliger <juergh at gmail.com>
Date: Tue Mar 25 21:49:02 2008 -0700
hwmon: (dme1737) demacrofy for readability
This patch gets rid of a couple of macros previously used for sysfs attribute
generation and manipulation. This makes the source a little bigger but a lot
more readable and maintainable. It also fixes an issue with pwm5 & pwm6
attributes not being created read-only initially.
Signed-Off-By: Juerg Haefliger <juergh at gmail.com>
Acked-by: Jean Delvare <khali at linux-fr.org>
Signed-off-by: Mark M. Hoffman <mhoffman at lightlink.com>
commit 388667bed591b2359713bb17d5de0cf56e961447
Author: Arthur Jones <ajones at riverbed.com>
Date: Fri Jul 25 12:03:38 2008 -0700
md: raid10: wake up frozen array
When rescheduling a bio in raid10, we wake up
the md thread, but if the array is frozen, this
will have no effect. This causes the array to
remain frozen for eternity. We add a wake_up
to allow the array to de-freeze. This code is
nearly identical to the raid1 code, which has
this fix already.
Signed-off-by: Arthur Jones <ajones at riverbed.com>
Signed-off-by: NeilBrown <neilb at suse.de>
commit c3f26a269c2421f97f10cf8ed05d5099b573af4d
Author: David S. Miller <davem at davemloft.net>
Date: Thu Jul 31 16:58:50 2008 -0700
netdev: Fix lockdep warnings in multiqueue configurations.
When support for multiple TX queues were added, the
netif_tx_lock() routines we converted to iterate over
all TX queues and grab each queue's spinlock.
This causes heartburn for lockdep and it's not a healthy
thing to do with lots of TX queues anyways.
So modify this to use a top-level lock and a "frozen"
state for the individual TX queues.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit c259ae52e204d42f8b2d484c85517a4c367030e1
Author: Julia Lawall <julia at diku.dk>
Date: Mon Jul 21 09:59:15 2008 +0200
[PATCH] ocfs2: Release mutex in error handling code
The mutex is released on a successful return, so it would seem that it
should be released on an error return as well.
The semantic patch finds this problem is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@@
expression l;
@@
mutex_lock(l);
... when != mutex_unlock(l)
when any
when strict
(
if (...) { ... when != mutex_unlock(l)
+ mutex_unlock(l);
return ...;
}
|
mutex_unlock(l);
)
// </smpl>
Signed-off-by: Julia Lawall <julia at diku.dk>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 961cecbee6786f4b1f1b8f695e87045b583f9f49
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Wed Jul 16 17:22:22 2008 -0700
[PATCH] ocfs2: Fix oops when racing files truncates with writes into an mmap region
This patch fixes an oops that is reproduced when one races writes to a mmap-ed
region with another process truncating the file.
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 539d8264093560b917ee3afe4c7f74e5da09d6a5
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Mon Jul 14 17:31:10 2008 -0700
[PATCH 2/2] ocfs2: Fix race between mount and recovery
As the fs recovery is asynchronous, there is a small chance that another
node can mount (and thus recover) the slot before the recovery thread
gets to it.
If this happens, the recovery thread will block indefinitely on the
journal/slot lock as that lock will be held for the duration of the mount
(by design) by the node assigned to that slot.
The solution implemented is to keep track of the journal replays using
a recovery generation in the journal inode, which will be incremented by the
thread replaying that journal. The recovery thread, before attempting the
blocking lock on the journal/slot lock, will compare the generation on disk
with what it has cached and skip recovery if it does not match.
This bug appears to have been inadvertently introduced during the mount/umount
vote removal by mainline commit 34d024f84345807bf44163fac84e921513dde323. In the
mount voting scheme, the messaging would indirectly indicate that the slot
was being recovered.
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit c69991aac71a8beb57c11d651c7fd4b24c32aa8b
Author: Sunil Mushran <sunil.mushran at oracle.com>
Date: Mon Jul 14 17:31:09 2008 -0700
[PATCH 1/2] ocfs2: Add counter in struct ocfs2_dinode to track journal replays
This patch renames the ij_pad to ij_recovery_generation in struct ocfs2_dinode.
This will be used to keep count of journal replays after an unclean shutdown.
Signed-off-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit ecb3d28c7edd58b54f16838c434b342ba9195bec
Author: Joel Becker <joel.becker at oracle.com>
Date: Wed Jun 18 19:29:05 2008 -0700
[PATCH] configfs: Convenience macros for attribute definition.
Sysfs has the _ATTR() and _ATTR_RO() macros to make defining extended
form attributes easier. configfs should have something similiar.
- _CONFIGFS_ATTR() and _CONFIGFS_ATTR_RO() are the counterparts to the
sysfs macros.
- CONFIGFS_ATTR_STRUCT() creates the extended form attribute structure.
- CONFIGFS_ATTR_OPS() defines the show_attribute()/store_attribute()
operations that call the show()/store() operations of the extended
form configfs_attributes.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 70526b67443a980d5029d9cf06903bef731a4e96
Author: Joel Becker <joel.becker at oracle.com>
Date: Tue Jun 17 15:34:32 2008 -0700
[PATCH] configfs: Pin configfs subsystems separately from new config_items.
configfs_mkdir() creates a new item by calling its parent's
->make_item/group() functions. Once that object is created,
configfs_mkdir() calls try_module_get() on the new item's module. If it
succeeds, the module owning the new item cannot be unloaded, and
configfs is safe to reference the item.
If the item and the subsystem it belongs to are part of the same module,
the subsystem is also pinned. This is the common case.
However, if the subsystem is made up of multiple modules, this may not
pin the subsystem. Thus, it would be possible to unload the toplevel
subsystem module while there is still a child item. Thus, we now
try_module_get() the subsystem's module. This only really affects
children of the toplevel subsystem group. Deeper children already have
their parents pinned.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 99cefda42ac550863b5ae1df9e60322e377decf9
Author: Louis Rilling <louis.rilling at kerlabs.com>
Date: Fri Jun 27 13:10:25 2008 +0200
[PATCH] configfs: Fix open directory making rmdir() fail
When checking for user-created elements under an item to be removed by rmdir(),
configfs_detach_prep() counts fake configfs_dirents created by dir_open() as
user-created and fails when finding one. It is however perfectly valid to remove
a directory that is open.
Simply make configfs_detach_prep() skip fake configfs_dirent, like it already
does for attributes, and like detach_groups() does.
Signed-off-by: Louis Rilling <louis.rilling at kerlabs.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 2e2ce171c3ba6f2753fb1fd2706b63683394da2d
Author: Louis Rilling <louis.rilling at kerlabs.com>
Date: Fri Jul 4 16:56:06 2008 +0200
[PATCH] configfs: Lock new directory inodes before removing on cleanup after failure
Once a new configfs directory is created by configfs_attach_item() or
configfs_attach_group(), a failure in the remaining initialization steps leads
to removing a directory which inode the VFS may have already accessed.
This commit adds the necessary inode locking to safely remove configfs
directories while cleaning up after a failure. As an advantage, the locking
rules of populate_groups() and detach_groups() become the same: the caller must
have the group's inode mutex locked.
Signed-off-by: Louis Rilling <louis.rilling at kerlabs.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 2a109f2a4155f168047aa2f5b3a170e279bef89a
Author: Louis Rilling <louis.rilling at kerlabs.com>
Date: Fri Jul 4 16:56:05 2008 +0200
[PATCH] configfs: Prevent userspace from creating new entries under attaching directories
process 1: process 2:
configfs_mkdir("A")
attach_group("A")
attach_item("A")
d_instantiate("A")
populate_groups("A")
mutex_lock("A")
attach_group("A/B")
attach_item("A")
d_instantiate("A/B")
mkdir("A/B/C")
do_path_lookup("A/B/C", LOOKUP_PARENT)
ok
lookup_create("A/B/C")
mutex_lock("A/B")
ok
configfs_mkdir("A/B/C")
ok
attach_group("A/C")
attach_item("A/C")
d_instantiate("A/C")
populate_groups("A/C")
mutex_lock("A/C")
attach_group("A/C/D")
attach_item("A/C/D")
failure
mutex_unlock("A/C")
detach_groups("A/C")
nothing to do
mkdir("A/C/E")
do_path_lookup("A/C/E", LOOKUP_PARENT)
ok
lookup_create("A/C/E")
mutex_lock("A/C")
ok
configfs_mkdir("A/C/E")
ok
detach_item("A/C")
d_delete("A/C")
mutex_unlock("A")
detach_groups("A")
mutex_lock("A/B")
detach_group("A/B")
detach_groups("A/B")
nothing since no _default_ group
detach_item("A/B")
mutex_unlock("A/B")
d_delete("A/B")
detach_item("A")
d_delete("A")
Two bugs:
1/ "A/B/C" and "A/C/E" are created, but never removed while their parent are
removed in the end. The same could happen with symlink() instead of mkdir().
2/ "A" and "A/C" inodes are not locked while detach_item() is called on them,
which may probably confuse VFS.
This commit fixes 1/, tagging new directories with CONFIGFS_USET_CREATING before
building the inode and instantiating the dentry, and validating the whole
group+default groups hierarchy in a second pass by clearing
CONFIGFS_USET_CREATING.
mkdir(), symlink(), lookup(), and dir_open() simply return -ENOENT if
called in (or linking to) a directory tagged with CONFIGFS_USET_CREATING. This
does not prevent userspace from calling stat() successfuly on such directories,
but this prevents userspace from adding (children to | symlinking from/to |
read/write attributes of | listing the contents of) not validated items. In
other words, userspace will not interact with the subsystem on a new item until
the new item creation completes correctly.
It was first proposed to re-use CONFIGFS_USET_IN_MKDIR instead of a new
flag CONFIGFS_USET_CREATING, but this generated conflicts when checking the
target of a new symlink: a valid target directory in the middle of attaching
a new user-created child item could be wrongly detected as being attached.
2/ is fixed by next commit.
Signed-off-by: Louis Rilling <louis.rilling at kerlabs.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 9a73d78cda750f12e25eb811878f2d9dbab1bc6e
Author: Louis Rilling <louis.rilling at kerlabs.com>
Date: Fri Jun 20 14:09:22 2008 +0200
[PATCH] configfs: Fix failing symlink() making rmdir() fail
On a similar pattern as mkdir() vs rmdir(), a failing symlink() may make rmdir()
fail for the symlink's parent and the symlink's target as well.
failing symlink() making target's rmdir() fail:
process 1: process 2:
symlink("A/S" -> "B")
allow_link()
create_link()
attach to "B" links list
rmdir("B")
detach_prep("B")
error because of new link
configfs_create_link("A", "S")
error (eg -ENOMEM)
failing symlink() making parent's rmdir() fail:
process 1: process 2:
symlink("A/D/S" -> "B")
allow_link()
create_link()
attach to "B" links list
configfs_create_link("A/D", "S")
make_dirent("A/D", "S")
rmdir("A")
detach_prep("A")
detach_prep("A/D")
error because of "S"
create("S")
error (eg -ENOMEM)
We cannot use the same solution as for mkdir() vs rmdir(), since rmdir() on the
target cannot wait on the i_mutex of the new symlink's parent without risking a
deadlock (with other symlink() or sys_rename()). Instead we define a global
mutex protecting all configfs symlinks attachment, so that rmdir() can avoid the
races above.
Signed-off-by: Louis Rilling <louis.rilling at kerlabs.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 4768e9b18dc63719209c68920d4ae52dc49b6161
Author: Louis Rilling <louis.rilling at kerlabs.com>
Date: Mon Jun 23 14:16:17 2008 +0200
[PATCH] configfs: Fix symlink() to a removing item
The rule for configfs symlinks is that symlinks always point to valid
config_items, and prevent the target from being removed. However,
configfs_symlink() only checks that it can grab a reference on the target item,
without ensuring that it remains alive until the symlink is correctly attached.
This patch makes configfs_symlink() fail whenever the target is being removed,
using the CONFIGFS_USET_DROPPING flag set by configfs_detach_prep() and
protected by configfs_dirent_lock.
This patch introduces a similar (weird?) behavior as with mkdir failures making
rmdir fail: if symlink() races with rmdir() of the parent directory (or its
youngest user-created ancestor if parent is a default group) or rmdir() of the
target directory, and then fails in configfs_create(), this can make the racing
rmdir() fail despite the concerned directory having no user-created entry (resp.
no symlink pointing to it or one of its default groups) in the end.
This behavior is fixed in later patches.
Signed-off-by: Louis Rilling <louis.rilling at kerlabs.com>
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit dacdd0e04768da1fd2b24a6ee274c582b40d0c5b
Author: Joel Becker <joel.becker at oracle.com>
Date: Thu Jul 17 16:54:19 2008 -0700
[PATCH] configfs: Include linux/err.h in linux/configfs.h
We now use PTR_ERR() in the ->make_item() and ->make_group() operations.
Folks including configfs.h need err.h.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 48a61569bb5396415c5dad0e81e1cfeb87c0aca3
Author: Adrian Bunk <bunk at kernel.org>
Date: Wed Jul 23 22:50:45 2008 +0300
kbuild: scripts/ver_linux: don't set PATH
It would have saved both a bug submitter and me a few hours if
scripts/ver_linux had picked the same gcc as the build.
Since I can't see any reason why it fiddles with PATH at all this patch
therefore removes the PATH setting.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit 775a7229ac862ea93924672e7e331edf8475415c
Author: jkacur <jkacur at gmail.com>
Date: Wed Jul 16 00:31:16 2008 +0200
Kconfig/init: change help text to match default value
Change the "If unsure" message to match the default value.
Signed-off-by: John Kacur <jkacur at gmail dot com>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit 3b40d38120c32798a4be8d8052f028deeca9d581
Author: Andreas Gruenbacher <agruen at suse.de>
Date: Mon Jul 21 04:28:25 2008 +0200
kbuild: genksyms: Include extern information in dumps
The extern flag currently is not included in type dump files
(genksyms --dump-types). Include that flag there for completeness.
Signed-off-by: Andreas Gruenbacher <agruen at suse.de>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit 94aa3d716ee0244cc5b9f2ab3745aed5fdfa30e0
Author: Andreas Gruenbacher <agruen at suse.de>
Date: Thu Jul 31 00:03:49 2008 +0200
kbuild: genksyms parser: fix the __attribute__ rule
We are having two kinds of problems with genksyms today: fake checksum
changes without actual ABI changes, and changes which we would rather like
to ignore (such as an additional field at the end of a structure that
modules are not supposed to touch, for example).
I have thought about ways to improve genksyms and compute checksums
differently to avoid those problems, but in the end I don't see a
fundamentally better way. So here are some genksyms patches for at least
making the checksums more easily manageable, if we cannot fully fix them.
In addition to the bugfixes (the first two patches), this allows genksyms
to track checksum changes and report why a checksum changed (third patch),
and to selectively ignore changes (fourth patch).
This patch:
Gcc __attribute__ definitions may occur repeatedly, e.g.,
static int foo __attribute__((__used__))
__attribute__((aligned (16)));
The genksyms parser does not understand this, and generates a syntax error.
Fix this case.
Signed-off-by: Andreas Gruenbacher <agruen at suse.de>
Cc: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit 1f4170e12db06fdde5279d665a7e6e2976b2b623
Author: Christian Borntraeger <borntraeger at de.ibm.com>
Date: Tue Jul 29 23:48:42 2008 +0200
KVM: s390: Fix kvm on IBM System z10
The z10 system supports large pages, kvm-s390 doesnt.
Make sure that we dont advertise large pages to avoid the guest crashing as
soon as the guest kernel activates DAT.
Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 6f5fd8e9b98423add5f67b964e7cc8733dd73460
Author: Jeff Garzik <jeff at garzik.org>
Date: Thu Jul 31 03:46:30 2008 -0400
drivers/media, include/media: delete zero-length files
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 967ab999a090b1a4e7d3c7febfd6d89b42fb4cf4
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Thu Jul 31 00:38:52 2008 -0700
netfilter: xt_hashlimit: fix race between htable_destroy and htable_gc
Deleting a timer with del_timer doesn't guarantee, that the
timer function is not running at the moment of deletion. Thus
in the xt_hashlimit case we can get into a ticklish situation
when the htable_gc rearms the timer back and we'll actually
delete an entry with a pending timer.
Fix it with using del_timer_sync().
AFAIK del_timer_sync checks for the timer to be pending by
itself, so I remove the check.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit a8ddc9163c6a16cd62531dba1ec5020484e33b02
Author: Pavel Emelyanov <xemul at openvz.org>
Date: Thu Jul 31 00:38:31 2008 -0700
netfilter: ipt_recent: fix race between recent_mt_destroy and proc manipulations
The thing is that recent_mt_destroy first flushes the entries
from table with the recent_table_flush and only *after* this
removes the proc file, corresponding to that table.
Thus, if we manage to write to this file the '+XXX' command we
will leak some entries. If we manage to write there a 'clean'
command we'll race in two recent_table_flush flows, since the
recent_mt_destroy calls this outside the recent_lock.
The proper solution as I see it is to remove the proc file first
and then go on with flushing the table. This flushing becomes
safe w/o the lock, since the table is already inaccessible from
the outside.
Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit ae375044d31075a31de5a839e07ded7f67b660aa
Author: Patrick McHardy <kaber at trash.net>
Date: Thu Jul 31 00:38:01 2008 -0700
netfilter: nf_conntrack_tcp: decrease timeouts while data in unacknowledged
In order to time out dead connections quicker, keep track of outstanding data
and cap the timeout.
Suggested by Herbert Xu.
Signed-off-by: Patrick McHardy <kaber at trash.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 4a22442faeb33bdf34016a7b1f6b3d6ecd4e33e5
Author: Jerry Hicks <hickswgjr at gmail.com>
Date: Wed Jul 30 12:49:59 2008 -0700
[MTD] [NOR] drivers/mtd/chips/jedec_probe.c: fix Am29DL800BB device ID
The device id for Am29DL800BB in jedec_probe.c is wrong.
Reference: http://www.spansion.com/datasheets/21519c4.pdf
I discovered this while working with u-boot.
The u-boot folks mentioned Linux as an upstream reference, thought I'd
post a heads-up here too.
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
commit 963e4975c6f93c148ca809d986d412201df9af89
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Thu Jul 24 17:16:06 2008 +0100
pata_it821x: Driver updates and reworking
- Add support for the RDC 1010 variant
- Rework the core library to have a read_id method. This allows the hacky
bits of it821x to go and prepares us for pata_hd
- Switch from WARN to BUG in ata_id_string as it will reboot if you get
it wrong so WARN won't be seen
- Allow the issue of command 0xFC on the 821x. This is needed to query
rebuild status.
- Tidy up printk formatting
- Do more ident rewriting on RAID volumes to handle firmware provided
ident data which is rather wonky
- Report the firmware revision and device layout in RAID mode
- Don't try and disable raid on the 8211 or RDC - they don't have the
relevant bits
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 1f938d060a7bc01b5f82d46db3e38cd501b445a6
Author: Alexander Beregalov <a.beregalov at gmail.com>
Date: Mon Jul 21 00:06:19 2008 +0400
libata.h: replace __FUNCTION__ with __func__
Signed-off-by: Alexander Beregalov <a.beregalov at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 487eff68e42287fd45cf178063f1ce1bad23c612
Author: Tejun Heo <htejun at gmail.com>
Date: Tue Jul 29 15:06:26 2008 +0900
ata_piix: subsys 106b:00a3 is apple ich8m too
Subsys 106b:00a3 also is the weird apple ich8m which chokes when the
latter two ports are accessed, add it. Reported by Felipe Sere.
Signed-off-by: Tejun Heo <tj at kernel.org>
Cc: Felipe Sere <dodofxp at gmail.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 49ea3b04971ece6a5efe5d7b763ad9d2f169d441
Author: Elias Oltmanns <eo at nebensachen.de>
Date: Wed Jul 30 12:32:39 2008 -0700
libata-core: make sure that ata_force_tbl is freed in case of an error
Fix a potential memory leak when ata_init() encounters an error.
Signed-off-by: Elias Oltmanns <eo at nebensachen.de>
Cc: Tejun Heo <tj at kernel.org>
Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 2486fa561a3192bbbec39c7feef87a1e07bd6342
Author: Tejun Heo <tj at kernel.org>
Date: Thu Jul 31 07:52:40 2008 +0900
libata: update atapi disable handling
Global and per-LLD ATAPI disable checks were done in the command issue
path probably because it was left out during EH conversion. On
affected machines, this can cause lots of warning messages. Move them
to where they belong - the probing path.
Reported by Chunbo Luo.
Signed-off-by: Tejun Heo <tj at kernel.org>
Cc: Chunbo Luo <chunbo.luo at windriver.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit bfce5e0179ad059035df28558724ff60af708e09
Author: JosephChan at via.com.tw <JosephChan at via.com.tw>
Date: Wed Jul 30 12:32:48 2008 -0700
pata_via: add VX800 flag; add function for fixing h/w bugs
Add flag VIA_SATA_PATA for vx800, VX800 uses the same
chipset(0x0581/0x5324) as CX700, which has 1 PATA channel(Master/Slave)
and 1 SATA channel(Master/Slave) Add function <via_ata_tf_load>. This is
to fix the internal bug of VIA chipsets, which will reset the device
register after changing the IEN bit in CTL register
Signed-off-by: Joseph Chan <josephchan at via.com.tw>
Cc: Tejun Heo <tj at kernel.org>
Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit e8389f0c44652ee63d95bc0a7f8d565ac25dac77
Author: Ben Dooks <ben-linux at fluff.org>
Date: Thu Jul 24 16:38:06 2008 +0100
pata_ali: misplaced pci_dev_put()
The ali_init_one() function does a search for an isa_bridge,
but then fails to release it if the revision information was
not correctly found.
the problem comes from:
isa_bridge = pci_get_device(...);
if (isa_bridge && ...) {
pci_dev_put(isa_bridge);
}
where the pci_dev_put() is never called if isa_bridge
was valid but the extra checks on the chip-revision
fail to match.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit a97a6f10771b90235b33c13a6db9279237a08422
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Wed Jul 30 17:20:18 2008 -0700
irda: replace __FUNCTION__ with __func__
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 1fa98174ba980b2826edd1e4632a17916dfdb4fa
Author: Matthew Garrett <mjg59 at srcf.ucam.org>
Date: Wed Jul 30 17:00:38 2008 -0700
nsc-ircc: default to dongle type 9 on IBM hardware
This is necessary to set the dongle type on the nsc driver in order to get
it to work correctly. Thinkpads all appear to use dongle type 9. This
patch defaults nsc devices with an IBM PnP descriptor to use type 9.
Signed-off-by: Matthew Garrett <mjg59 at srcf.ucam.org>
Signed-off-by: Ben Collins <ben.collins at canonical.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
commit 5aa10cad69d282acfaf89d3c16ee07f9b279dbd2
Author: Michael Frey <michael.frey at canonical.com>
Date: Wed Jul 30 16:59:15 2008 -0700
bluetooth: add quirks for a few hci_usb devices
Preface: The "Broadcom" device is on unreleased hardware, so I can't
disclose the actual model.
When the Dell 370 and 410 BT adapters are put into BT radio mode, they
need to be prepared like many other Broadcom adapters.
Also, add quirk Broadcom 2046 devices with HCI_RESET. Reference for this
bug: https://launchpad.net/bugs/249448
Signed-off-by: Michael Frey <michael.frey at canonical.com>
Signed-off-by: Mario Limonciello <Mario_Limonciello at Dell.com>
Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
Signed-off-by: Ben Collins <ben.collins at canonical.com>
Acked-by: Marcel Holtmann <marcel at holtmann.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit a7403e807d5f6431a09abb13a00f8170dac1da29
Author: David Howells <dhowells at redhat.com>
Date: Wed Jul 30 16:48:05 2008 -0700
hysdn: remove the packed attribute from PofTimStamp_tag
Remove the packed attribute from PofTimStamp_tag in the hysdn driver as the
thing being packed is just an array of chars and so is unpackable.
This deals with a compiler warning:
In file included from drivers/isdn/hysdn/hysdn_boot.c:19:
drivers/isdn/hysdn/hysdn_pof.h:63: warning: 'packed' attribute ignored for field of type 'unsigned char[40]'
Signed-off-by: David Howells <dhowells at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 02137f2e80a4fb1481b2b1663d3d3795e705c5bc
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Wed Jul 30 16:40:22 2008 -0700
isdn: use the common ascii hex helpers
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Acked-by: Karsten Keil <kkeil at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 12dac0756d357325b107fe6ec24921ec38661839
Author: Rafael J. Wysocki <rjw at sisk.pl>
Date: Wed Jul 30 16:37:33 2008 -0700
tg3: adapt tg3 to use reworked PCI PM code
Adapt the tg3 driver to use the reworked PCI PM and make it use the
exported PCI PM core functions instead of accessing the PCI PM registers
directly by itself.
Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 849e8caa477d72cf153e5c0b6ce0c00b89738abb
Author: David Howells <dhowells at redhat.com>
Date: Wed Jul 30 16:33:05 2008 -0700
atm: fix direct casts of pointers to u32 in the InterPhase driver
Fix direct casts of pointers to u32 in the InterPhase ATM driver. These are
all arguments being passed to printk() calls. So drop the cast and change the
%x to a %p.
Signed-off-by: David Howells <dhowells at redhat.com>
Acked-by: Chas Williams <chas at cmf.nrl.navy.mil>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit cba5cbd1559f49bec76e54de6ed21b7df3742ada
Author: David Howells <dhowells at redhat.com>
Date: Wed Jul 30 16:31:46 2008 -0700
atm: fix const assignment/discard warnings in the ATM networking driver
Fix const assignment/discard warnings in the ATM networking driver.
The lane2_assoc_ind() function needed its arguments changing to match changes
in the lane2_ops struct (patch 61c33e012964ce358b42d2a1e9cd309af5dab02b
"atm: use const where reasonable").
Signed-off-by: David Howells <dhowells at redhat.com>
Acked-by: Chas Williams <chas at cmf.nrl.navy.mil>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 6a8341b68b5269de71c32c6df91f4b0298da031d
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Wed Jul 30 16:30:15 2008 -0700
net: use the common ascii hex helpers
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 697f8d0348a652593d195a13dd1067d9df911a82
Author: Stephen Hemminger <shemminger at vyatta.com>
Date: Wed Jul 30 16:29:19 2008 -0700
random32: seeding improvement
The rationale is:
* use u32 consistently
* no need to do LCG on values from (better) get_random_bytes
* use more data from get_random_bytes for secondary seeding
* don't reduce state space on srandom32()
* enforce state variable initialization restrictions
Note: the second paper has a version of random32() with even longer period
and a version of random64() if needed.
Signed-off-by: Stephen Hemminger <shemminger at vyatta.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
commit 4adf0af6818f3ea52421dc0bae836cfaf20ef72a
Author: Simon Wunderlich <siwu at hrz.tu-chemnitz.de>
Date: Wed Jul 30 16:27:55 2008 -0700
bridge: send correct MTU value in PMTU (revised)
When bridging interfaces with different MTUs, the bridge correctly chooses
the minimum of the MTUs of the physical devices as the bridges MTU. But
when a frame is passed which fits through the incoming, but not through
the outgoing interface, a "Fragmentation Needed" packet is generated.
However, the propagated MTU is hardcoded to 1500, which is wrong in this
situation. The sender will repeat the packet again with the same frame
size, and the same problem will occur again.
Instead of sending 1500, the (correct) MTU value of the bridge is now sent
via PMTU. To achieve this, the corresponding rtable structure is stored
in its net_bridge structure.
Modified to get rid of fake_net_device as well.
Signed-off-by: Simon Wunderlich <siwu at hrz.tu-chemnitz.de>
Signed-off-by: Stephen Hemminger <shemminger at linux-foundation.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit e62112c53acfefc67ccfbdc1895eebccf866bc1b
Merge: 031cf19e6f63941506c9baf76ac7adac06edcf08 68905eb4dc9c691ba09df767ac0641395025cef6
Author: David S. Miller <davem at davemloft.net>
Date: Wed Jul 30 15:44:30 2008 -0700
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
commit 8b6d8c592fa7b8bfb1218447a273314c13a67e8a
Merge: 94ad374a0751f40d25e22e036c37f7263569d24c de1d7bb63893b4246ce60797aa554341e908f034
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Jul 30 15:14:56 2008 -0700
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Cobalt: update defconfig
[MIPS] kgdb: add arch support for the kernel's kgdb core
[MIPS] kgdb: Remove existing implementation
[MIPS] TXx9: Kconfig cleanup
[MIPS] TXx9: Kill unused txx927.h
[MIPS] TXx9: Support early_printk
[MIPS] TXx9: Unify serial_txx9 setup
[MIPS] TXx9: Random cleanup
[MIPS] TXx9: Make tx4938-specific code more independent
[MIPS] TXx9: Make tx3927-specific code more independent
[MIPS] TXx9: Cleanup watchdog
[MIPS] TXx9: Cleanup restart/halt/power_off
[MIPS] TXx9: PCI error handling
[MIPS] TXx9: Add some pci options
[MIPS] Introduce pcibios_plat_setup
[MIPS] TXx9: PCI fixes for tx3927/tx4927
[MIPS] TXx9: Fix JMR3927 irq numbers
[MIPS] RB532: Flags are unsigned long
[MIPS] Initialization of Alchemy boards
[MIPS] tlb-r4k: Nuke broken paranoia error test.
commit 94ad374a0751f40d25e22e036c37f7263569d24c
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Jul 30 14:45:12 2008 -0700
Fix off-by-one error in iov_iter_advance()
The iov_iter_advance() function would look at the iov->iov_len entry
even though it might have iterated over the whole array, and iov was
pointing past the end. This would cause DEBUG_PAGEALLOC to trigger a
kernel page fault if the allocation was at the end of a page, and the
next page was unallocated.
The quick fix is to just change the order of the tests: check that there
is any iovec data left before we check the iov entry itself.
Thanks to Alexey Dobriyan for finding this case, and testing the fix.
Reported-and-tested-by: Alexey Dobriyan <adobriyan at gmail.com>
Cc: Nick Piggin <npiggin at suse.de>
Cc: Andrew Morton <akpm at linux-foundation.org>
Cc: <stable at kernel.org> [2.6.25.x, 2.6.26.x]
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0056e65f9e28d83ee1a3fb4f7d0041e838f03c34
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Jul 30 14:26:25 2008 -0700
romfs_readpage: don't report errors for pages beyond i_size
We zero-fill them like we are supposed to, and that's all fine. It's
only an error if the 'romfs_copyfrom()' routine isn't able to fill the
data that is supposed to be there.
Most of the patch is really just re-organizing the code a bit, and using
separate variables for the error value and for how much of the page we
actually filled from the filesystem.
Reported-and-tested-by: Chris Fester <cfester at wms.com>
Cc: Alexander Viro <viro at zeniv.linux.org.uk>
Cc: Matt Waddel <matt.waddel at freescale.com>
Cc: Greg Ungerer <gerg at snapgear.com>
Signed-of-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 68905eb4dc9c691ba09df767ac0641395025cef6
Author: Julia Lawall <julia at diku.dk>
Date: Mon Jul 21 09:57:26 2008 +0200
drivers/net/ehea/ehea_main.c: Release mutex in error handling code
The mutex is released on a successful return, so it would seem that it
should be released on an error return as well.
The semantic patch finds this problem is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@@
expression l;
@@
mutex_lock(l);
... when != mutex_unlock(l)
when any
when strict
(
if (...) { ... when != mutex_unlock(l)
+ mutex_unlock(l);
return ...;
}
|
mutex_unlock(l);
)
// </smpl>
Signed-off-by: Julia Lawall <julia at diku.dk>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit b0ca2a21f769ae255bd6821cbc5af8af797f1da7
Author: Nobuhiro Iwamatsu <iwamatsu.nobuhiro at renesas.com>
Date: Mon Jun 30 11:08:17 2008 +0900
sh_eth: Add support of SH7763 to sh_eth
SH7763 has Ethernet core same as SH7710/SH7712.
Positions of some registry are different, but the basic part is the same.
I add support of ethernet of sh7763 to sh_eth.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro at renesas.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit d02a4e31ed0385eb34fe49f19d69a860a020ca3c
Author: Mikael Pettersson <mikpe at it.uu.se>
Date: Wed Jul 30 13:44:55 2008 +0200
fix NE2000 linkage error
Trying to build with CONFIG_NE2000=m fails with:
scripts/mod/modpost -o /tmp/tmp/linux-2.6.27-rc1/Module.symvers -S -s
ERROR: "NS8390_init" [drivers/net/ne.ko] undefined!
This is because the split of 8390 into pausing and non-pausing
versions was incompletely propagated to ne.c. This fixes it.
Signed-off-by: Mikael Pettersson <mikpe at it.uu.se>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit de1d7bb63893b4246ce60797aa554341e908f034
Author: Yoichi Yuasa <yoichi_yuasa at tripeaks.co.jp>
Date: Sat Jul 26 01:34:52 2008 +0900
[MIPS] Cobalt: update defconfig
Select new LCD framebuffer driver.
Signed-off-by: Yoichi Yuasa <yoichi_yuasa at tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 8854700115ecf8aa6f087aa915b7b6cf18090d39
Author: Jason Wessel <jason.wessel at windriver.com>
Date: Tue Jul 29 15:58:53 2008 -0500
[MIPS] kgdb: add arch support for the kernel's kgdb core
The new kgdb architecture specific handler registers and unregisters
dynamically for exceptions depending on when you configure a kgdb I/O
driver.
Aside from initializing the exceptions earlier in the boot process,
kgdb should have no impact on a device when it is compiled in so long
as an I/O module is not configured for use.
There have been quite a number of contributors during the existence of
this patch (see arch/mips/kernel/kgdb.c). Most recently Jason
re-wrote the mips kgdb logic to use the die notification handlers.
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 8d60a903d986ffa26c41f0092320a3b9da20bfaf
Author: Jason Wessel <jason.wessel at windriver.com>
Date: Tue Jul 29 15:58:52 2008 -0500
[MIPS] kgdb: Remove existing implementation
This patch explicitly removes the kgdb implementation, for mips which
is intended to be followed by a patch that adds a kgdb implementation
for MIPS that makes use of the kgdb core in the kernel.
Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 8f8da9adebdf04bfb3b812a7de8706fbf179fd2c
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Tue Jul 29 22:11:33 2008 +0900
[MIPS] TXx9: Kconfig cleanup
Unify some entries in txx9/Kconfig.
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 872bfdd9e61d7dacf011046b02442215a2757026
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Tue Jul 29 22:10:47 2008 +0900
[MIPS] TXx9: Kill unused txx927.h
include/asm-mips/txx9/txx927.h is no longer used.
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit e352953ce00bb870124e9054dbbbda2262f9269c
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Tue Jul 29 22:10:08 2008 +0900
[MIPS] TXx9: Support early_printk
Kill jmr3927-specific prom_putchar and add txx9-generic prom_putchar
to support early_printk.
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 7779a5e07d33fe316fe468e7afe7975fb686a831
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Fri Jul 25 23:08:06 2008 +0900
[MIPS] TXx9: Unify serial_txx9 setup
* Unify calling of early_serial_txx9_setup.
* Use dedicated serial clock on RBTX4938.
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit bb72f1f729dcbd6a6a93c74479eeaa19deebfb47
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Thu Jul 24 00:25:21 2008 +0900
[MIPS] TXx9: Random cleanup
* Random cleanups spotted by checkpatch script.
* Do not initialize panic_timeout. "panic=" kernel parameter can be used.
* Do not add "ip=any" or "ip=bootp". This options is not board specific.
* Do not add "root=/dev/nfs". This is default on CONFIG_ROOT_NFS.
* Kill unused error checking.
* Fix IRQ comment to match current code.
* Kill some unneeded includes
* ST0_ERL is already cleared in generic code.
* conswitchp is initialized generic code.
* __init is not needed in prototype.
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit c49f91f51e3cca796494f69fd967a7f72df5d457
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Thu Jul 24 00:25:20 2008 +0900
[MIPS] TXx9: Make tx4938-specific code more independent
Make some TX4938 SoC specific code independent from board specific code.
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit f6727fb889c664be094fa041a0fdf0f1a1caefb6
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Thu Jul 24 00:25:19 2008 +0900
[MIPS] TXx9: Make tx3927-specific code more independent
Make some TX3927 SoC specific code independent from board specific code.
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 683147254ef7e69ebbbe55280ba6a3c5ae2325d8
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Thu Jul 24 00:25:18 2008 +0900
[MIPS] TXx9: Cleanup watchdog
Unify registration of txx9wdt platform device.
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit a49297e8fc8a9a835ac4ec124aa83028abdcc7d5
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Thu Jul 24 00:25:17 2008 +0900
[MIPS] TXx9: Cleanup restart/halt/power_off
Unify machine_restart/machine_halt/pm_power_off and add fallback
machine_halt routine.
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 455cc256eb23915100e203fb33ee143afd127954
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Fri Jul 25 23:01:35 2008 +0900
[MIPS] TXx9: PCI error handling
From: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Thu, 24 Jul 2008 00:25:16 +0900
Subject: [PATCH] txx9: PCI error handling
Add more control and detailed report on PCI error interrupt.
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 07517529225ae4ce770271f83d8cd1004733a01d
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Thu Jul 24 00:25:15 2008 +0900
[MIPS] TXx9: Add some pci options
Add pci options for backplane type, clock selection, error handling,
timeout values.
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 47a5c976486e407fc0d0bc8fa165132b6f9bec26
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Thu Jul 24 00:25:14 2008 +0900
[MIPS] Introduce pcibios_plat_setup
Introduce pcibios_plat_setup for platform-specific pcibios_setup.
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 32d00d0f933ea5d21c3cd0809461ebbf7ab89cef
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Thu Jul 24 00:25:13 2008 +0900
[MIPS] TXx9: PCI fixes for tx3927/tx4927
* Fix tx3927 pci ops for Type-1 configuration
* Fix abort checking of tx3927 pci ops
* Flush write buffer to avoid spurious PCI error interrupt
* Add a quirk for FPCIB backplane
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit a0e31fb09056224c5d6fef09d25cb96b6149aa7c
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Thu Jul 24 00:25:12 2008 +0900
[MIPS] TXx9: Fix JMR3927 irq numbers
* Fix wrong txx9_clockevent interrupt number
* Fix TXX9_IRQ_BASE for JMR3927+FPCIB case
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 8b32d6d00ca890ebb204da1260247c11bba042b3
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Jul 29 09:46:34 2008 +0300
[MIPS] RB532: Flags are unsigned long
A recent generic change now catches such bugs:
<-- snip -->
...
CC arch/mips/rb532/time.o
cc1: warnings being treated as errors
/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/rb532/time.c: In function 'plat_time_init':
/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/rb532/time.c:55: error: comparison of distinct pointer types lacks a cast
/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/rb532/time.c:66: error: comparison of distinct pointer types lacks a cast
make[2]: *** [arch/mips/rb532/time.o] Error 1
<-- snip -->
Reported-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit fd7ccfa7ac64156a5c1c906e0986b73d481b6dfc
Author: Kevin Hickey <khickey at rmicorp.com>
Date: Mon Jul 28 13:09:26 2008 -0500
[MIPS] Initialization of Alchemy boards
An earlier update changed some calls from simple_strotl to strict_strtol but
did not account for the differences in the syntax between the calls.
simple_strotl returns the integer; strict_strtol returns an error code and
takes a pointer to the result. As it was, NULL was being passed in place of
the result, which led to failures during kernel initialization when using
YAMON.
Signed-off-by: Kevin Hickey <khickey at rmicorp.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit af6dc22b03a95c31b690f299b2fd7acb279fe7f5
Author: Ralf Baechle <ralf at linux-mips.org>
Date: Tue Jul 22 18:04:38 2008 +0100
[MIPS] tlb-r4k: Nuke broken paranoia error test.
Bug originally found and reported by Julia Lawall <julia at diku.dk>. I
decieded that the whole error check was mostly useless paranoia and should
be discarded. It would only ever trigger if r3k_have_wired_reg has a wrong
value.
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 11ddad396086f8d1dfcb0056dc9d65d228f755c1
Author: Adrian Bunk <bunk at kernel.org>
Date: Thu Jul 17 02:08:12 2008 +0300
kbuild: scripts/genksyms/lex.l: add %option noinput
gcc 4.3 correctly determines that input() is unused and gives the
following warning:
<-- snip -->
...
HOSTCC scripts/genksyms/lex.o
scripts/genksyms/lex.c:1487: warning: ‘input’ defined but not used
...
<-- snip -->
Fix it by adding %option noinput to scripts/genksyms/lex.l and
regeneration of scripts/genksyms/lex.c_shipped.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit be2be1d59035a28debb22555f103e676a8f74186
Author: Adrian Bunk <bunk at kernel.org>
Date: Thu Jul 17 02:07:59 2008 +0300
kconfig: scripts/kconfig/zconf.l: add %option noinput
gcc 4.3 correctly determines that input() is unused and gives the
following warning:
<-- snip -->
...
HOSTCC scripts/kconfig/zconf.tab.o
scripts/kconfig/lex.zconf.c:1628: warning: ‘input’ defined but not used
...
<-- snip -->
Fix it by adding %option noinput to scripts/kconfig/zconf.l and
regeneration of scripts/kconfig/lex.zconf.c_shipped.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Cc: Roman Zippel <zippel at linux-m68k.org>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit ea35455e0dc17d732436a5b98bd511cab64eb10e
Author: Sam Ravnborg <sam at ravnborg.org>
Date: Wed Jul 30 22:21:20 2008 +0200
kbuild: fix O=... build of um
We used include/asm-$ARCH/system.h to check if
we should create a symlink in include2 directory with
make O=... builds.
But um does not have such a file thus build filed.
Let's try anohter filename:
$ ls -d include/asm-* | wc -l
21
$ ls -d include/asm-*/errno.h | wc -l
21
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Cc: Jeff Dike <jdike at addtoit.com>
commit 660fc1f4d88b0f5e4bb936e4a5a9b95b70df9e58
Merge: 3dd730f2b49f101b90d283c3efc4e6cd826dd8f6 ce0ad7f0952581ba75ab6aee55bb1ed9bb22cf4f
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Jul 30 10:43:56 2008 -0700
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/mm: Lockless get_user_pages_fast() for 64-bit (v3)
powerpc: Don't use the wrong thread_struct for ptrace get/set VSX regs
powerpc: Fix ptrace buffer size for VSX
powerpc: Correctly hookup PTRACE_GET/SETVSRREGS for 32 bit processes
ide/powermac: Fix use of uninitialized pointer on media-bay
powerpc: Allow non-hcall return values for lparcfg writes
ipmi/powerpc: Use linux/of_{device,platform}.h instead of asm
powerpc/fsl: proliferate simple-bus compatibility to soc nodes
Documentation: remove old sbc8260 board specific information
cpm2: Rework baud rate generators configuration to support external clocks.
powerpc: rtc_cmos_setup: assign interrupts only if there is i8259 PIC
cpm_uart: Add generic clock API support to set baudrates
cpm_uart: Modem control lines support
powerpc: implement GPIO LIB API on CPM1 Freescale SoC.
cpm2: Implement GPIO LIB API on CPM2 Freescale SoC.
powerpc: Fix 8xx build failure
powerpc: clean up the Book-E HW watchpoint support
commit 3dd730f2b49f101b90d283c3efc4e6cd826dd8f6
Author: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Tue Jul 29 16:07:37 2008 +1000
cpumask: statement expressions confuse some versions of gcc
when you take the address of the result. Noticed on a sparc64 compile
using a version 3.4.5 cross compiler.
kernel/time/tick-common.c: In function `tick_check_new_device':
kernel/time/tick-common.c:210: error: invalid lvalue in unary `&'
...
Just make it a regular expression.
Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
Acked-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a4319d9fa02fb3f032596d18c6fcc8b05d01a3a5
Merge: afd962a9e8708c571c5c0c4a6d098f931742c229 031cf19e6f63941506c9baf76ac7adac06edcf08
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Jul 30 10:13:37 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: (47 commits)
net: Make "networking" one-click deselectable.
ipv6: Fix useless proc net sockstat6 removal
tcp: MD5: Use MIB counter instead of warning for MD5 mismatch.
pkt_sched: Fix OOPS on ingress qdisc add.
niu: Fix error checking in niu_ethflow_to_class.
IPv6: datagram_send_ctl() should exit immediately when an error occured
mac80211: fix mesh beaconing
PS3: gelic: use unsigned long for irqflags
mac80211: fix cfg80211 hooks for master interface
nl80211: fix dump callbacks
mac80211: partially fix skb->cb use
rtl8187: Improve wireless statistics for RTL8187B
rtl8187: Fix for TX sequence number problem
mac80211: append CONFIG_ to MAC80211_VERBOSE_PS_DEBUG in net/mac80211/tx.c.
mac80211: fix sparse integer as NULL pointer warning
drivers/net/wireless/iwlwifi/iwl-led.c: printk fix
mac80211: return correct error return from ieee80211_wep_init
mac80211: tx, use dev_kfree_skb_any for beacon_get
rt2x00: Clear queue entry flags during initialization
rt2x00: Force full register config after start()
...
commit afd962a9e8708c571c5c0c4a6d098f931742c229
Author: Vitaly Mayatskikh <v.mayatskih at gmail.com>
Date: Wed Jul 30 13:30:14 2008 +0200
x86: wrong register was used in align macro
New ALIGN_DESTINATION macro has sad typo: r8d register was used instead
of ecx in fixup section. This can be considered as a regression.
Register ecx was also wrongly loaded with value in r8d in
copy_user_nocache routine.
Signed-off-by: Vitaly Mayatskikh <v.mayatskih at gmail.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit bd3e64c1759e4930315ebf022611468ee9621486
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Jul 29 22:34:19 2008 -0700
sgi-xp: setup the notify GRU message queue
Setup the notify GRU message queue that is used for sending user messages
on UV systems.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Cc: Jack Steiner <steiner at sgi.com>
Cc: "Luck, Tony" <tony.luck at intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5b8669dfd110a62a74eea525a009342f73987ea0
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Jul 29 22:34:18 2008 -0700
sgi-xp: setup the activate GRU message queue
Setup the activate GRU message queue that is used for partition activation
and channel connection on UV systems.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Cc: Jack Steiner <steiner at sgi.com>
Cc: "Luck, Tony" <tony.luck at intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 83469b5525b4a35be40b17cb41d64118d84d9f80
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Jul 29 22:34:18 2008 -0700
sgi-xp: cleanup naming of partition defines
Cleanup naming of partition defines.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Cc: Jack Steiner <steiner at sgi.com>
Cc: "Luck, Tony" <tony.luck at intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 61deb86e98f51151b225f7563ee1cf2b50857d10
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Jul 29 22:34:17 2008 -0700
sgi-xp: move xpc_check_remote_hb() to support both SN2 and UV
Move xpc_check_remote_hb() so it can support both SN2 and UV.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Cc: Jack Steiner <steiner at sgi.com>
Cc: "Luck, Tony" <tony.luck at intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a812dcc3a298eef650c381e094e2cf41a4ecc9ad
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Jul 29 22:34:16 2008 -0700
sgi-xp: add usage of GRU driver by xpc_remote_memcpy()
Add UV support to xpc_remote_memcpy(), which involves interfacing to the
GRU driver.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Cc: Jack Steiner <steiner at sgi.com>
Cc: "Luck, Tony" <tony.luck at intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 261f3b4979db88d29fc86aad9f76fbc0c2c6d21a
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Jul 29 22:34:16 2008 -0700
sgi-xp: enable building of XPC/XPNET on x86_64
Get XPC/XPNET to build on x86_64. Trying to modprobe them up on a non-UV
or sn2 system will result in a -ENODEV.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Cc: Jack Steiner <steiner at sgi.com>
Cc: "Luck, Tony" <tony.luck at intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 81fe7883d2c8a80a7145ad22f8cd8514d05412b9
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Jul 29 22:34:15 2008 -0700
sgi-xp: add 'jiffies' to reserved page's timestamp name
Rename XPC's reserved page's timestamp member to reflect the units of time
involved.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 04de741885bc7565a28150e82c56a56e544440e6
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Jul 29 22:34:14 2008 -0700
sgi-xp: use standard bitops macros and functions
Change sgi-xp to use the standard bitops macros and functions instead of
trying to invent its own mechanism.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ea57f80c8c0e59cfc5095f7e856ce7c8e6ac2984
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Jul 29 22:34:14 2008 -0700
sgi-xp: eliminate '>>>' in comments
Comments in /drivers/misc/sgi-xp has been using '>>>' as a means to draw
attention to something that needs to be done or considered. To avoid
colliding with git rejects, '>>>' will now be replaced by '!!!' to
indicate something to do, and by '???' to indicate something to be
considered.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8e85c23ef04fe0d8414e0b1dc04543095282a27a
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Jul 29 22:34:13 2008 -0700
sgi-xp: add _sn2 suffix to a few variables
Add an '_sn2' suffix to some variables found in xpc_sn2.c.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ee6665e3b6e1283c30ae240732af1345bc02154e
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Jul 29 22:34:13 2008 -0700
sgi-xp: isolate remote copy buffer to sn2 only
Make the remote copy buffer an sn2 only item.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a7b4d509205db5e9cd3ffc77b306d7b10fe6a34d
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Jul 29 22:34:12 2008 -0700
sgi-xp: enable XPNET to handle more than 64 partitions
Enable XPNET to support more than 64 partitions.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 185c3a1b4bb4353529257f97caaeaac6c695e77d
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Jul 29 22:34:11 2008 -0700
sgi-xp: isolate allocation of XPC's msgqueues to sn2 only
Move the allocation of XPC's msgqueues to xpc_sn2.c.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c39838ce21ca8e05857ed7f4be5d289011561905
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Jul 29 22:34:11 2008 -0700
sgi-xp: replace AMO_t typedef by struct amo
Replace the AMO_t typedef by a direct reference to 'struct amo'.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7fb5e59d63deda89a8eefdbd5b3c8d622076afd4
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Jul 29 22:34:10 2008 -0700
sgi-xp: separate chctl_flags from XPC's notify IRQ
Tie current IPI references to either XPC's notify IRQ or channel control
flags.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a47d5dac9d8481766382f8cf1483dd581df38b99
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Jul 29 22:34:09 2008 -0700
sgi-xp: isolate additional sn2 specific code
Move additional sn2 specific code into xpc_sn2.c.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6e41017aad9ed175ca51e4828eabc8c5cf5910be
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Jul 29 22:34:09 2008 -0700
sgi-xp: isolate activate IRQ's hardware specific components
Isolate architecture specific code related to XPC's activate IRQ.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 97bf1aa1e1bb18de9bb1987c6eb9ad751bf08aab
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Jul 29 22:34:08 2008 -0700
sgi-xp: move xpc_allocate() into xpc_send()/xpc_send_notify()
Move xpc_allocate() functionality into xpc_send()/xpc_send_notify() so
xpc_allocate() no longer needs to be called by XPNET.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit aaa3cd694c0c4ae534e8aafdf4227e395c57d6bd
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Jul 29 22:34:07 2008 -0700
sgi-xp: base xpc_rsvd_page's timestamp on jiffies
Change XPC's reserved page timestamp to be based on jiffies.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 33ba3c7724be79f7cdbfc611335572c056d9a05a
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Jul 29 22:34:07 2008 -0700
sgi-xp: isolate xpc_vars structure to sn2 only
Isolate the xpc_vars structure of XPC's reserved page to sn2 only.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e17d416b1bc947df68499863f13b401fb42b48f6
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Jul 29 22:34:06 2008 -0700
sgi-xp: isolate xpc_vars_part structure to sn2 only
Isolate the xpc_vars_part structure of XPC's reserved page to sn2 only.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 94bd2708d4a95d7da5a1c7c28a063eccd127fb69
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Jul 29 22:34:05 2008 -0700
sgi-xp: prepare xpc_rsvd_page to work on either sn2 or uv hardware
Prepare XPC's reserved page header to work for either sn2 or uv.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 908787db9b95f548270af18d83d62b9d2020ca10
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Jul 29 22:34:05 2008 -0700
sgi-xp: create a common xp_remote_memcpy() function
Create a common remote memcpy function that maps to what the hardware
booted supports.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit bc63d387e4f5dbbe4ea0c5ade862c38073fd7fa3
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Jul 29 22:34:04 2008 -0700
sgi-xp: support runtime selection of xp_max_npartitions
Support runtime selection of the max number of partitions based on the
hardware being run on.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 78ce1bbe446e9b46dcd6c1e60a4768448a8ce355
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Jul 29 22:34:03 2008 -0700
sgi-xp: define BYTES_PER_WORD
Add a BYTES_PER_WORD #define.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit da9705259848b968cdf6151b977334fe7b5b0461
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Jul 29 22:34:03 2008 -0700
sgi-xp: define xpSalError reason code
Define xpSalError reason code.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 355c54d2e70093f09910d2ecf343023aefc219e1
Author: Dean Nelson <dcn at sgi.com>
Date: Tue Jul 29 22:34:02 2008 -0700
sgi-xp: define is_shub() and is_uv() macros
Define the is_shub()/is_uv() macros if they've not already been defined.
Signed-off-by: Dean Nelson <dcn at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9ca8e40c130c906c1060d105e63628410c860261
Author: Jack Steiner <steiner at sgi.com>
Date: Tue Jul 29 22:34:02 2008 -0700
GRU Driver V3: fixes to resolve code review comments
Fixes problems identified in a code review:
- add comment with high level dscription of the GRU
- prepend "gru_" to all global names
- delete unused function
- couple of trivial bug fixes
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Jack Steiner <steiner at sgi.com>
Cc: Nick Piggin <nickpiggin at yahoo.com.au>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3d919e5f6b440bb0cc7996eb7628b29be09e6343
Author: Jack Steiner <steiner at sgi.com>
Date: Tue Jul 29 22:34:01 2008 -0700
GRU Driver: driver/misc Makefile & Kconfig changes
Driver/misc changes for the GRU driver
Signed-off-by: Jack Steiner <steiner at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0d39741a27d86d305cc75ba626392be410dcbab9
Author: Jack Steiner <steiner at sgi.com>
Date: Tue Jul 29 22:34:01 2008 -0700
GRU Driver: export is_uv_system(), zap_page_range() & follow_page()
Exports needed by the GRU driver.
Signed-off-by: Jack Steiner <steiner at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3c45f6928322773b1810fbec1ece77056f914114
Author: Jack Steiner <steiner at sgi.com>
Date: Tue Jul 29 22:34:00 2008 -0700
GRU Driver: driver makefile
This patch adds the GRU driver makefile
Signed-off-by: Jack Steiner <steiner at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ee5b8feca3af01400e26637209a72fbf137c82ff
Author: Jack Steiner <steiner at sgi.com>
Date: Tue Jul 29 22:33:59 2008 -0700
GRU Driver: TLB flushing, MMUOPS callouts
This file contains the functions for handlinf GRU TLB flushing, This
includes functions to handle the MMUOPS callouts.
Signed-off-by: Jack Steiner <steiner at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1d09d737ab017ff7a9745962e19909713ac89b37
Author: Jack Steiner <steiner at sgi.com>
Date: Tue Jul 29 22:33:59 2008 -0700
GRU Driver: /proc interfaces
This file externalizes some GRU state & statistics to the user using the
/proc file system.
Signed-off-by: Jack Steiner <steiner at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9a0deecc90de62c91d7107611446c0c950091851
Author: Jack Steiner <steiner at sgi.com>
Date: Tue Jul 29 22:33:58 2008 -0700
GRU Driver: resource management
This file contains functions realted to managing GRU resources provided to
the user. Examples include GRU context assignment, load, unload,
migration, etc..
Signed-off-by: Jack Steiner <steiner at sgi.com>
Cc: Nick Piggin <nickpiggin at yahoo.com.au>
Cc: Hugh Dickins <hugh at veritas.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 28bffaf094a6d0992c85e1b01f04c9b0f56c9d62
Author: Jack Steiner <steiner at sgi.com>
Date: Tue Jul 29 22:33:57 2008 -0700
GRU Driver: kernel services provide by driver
This file contains functions for handling services provided to other
kernel modules that use the GRU.
Signed-off-by: Jack Steiner <steiner at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 142586409c8be7dc071bb94d7cd2d69ccfd99b6b
Author: Jack Steiner <steiner at sgi.com>
Date: Tue Jul 29 22:33:57 2008 -0700
GRU Driver: page faults & exceptions
This file contains the functions that manage GRU page faults and
exceptions.
Signed-off-by: Jack Steiner <steiner at sgi.com>
Cc: Christoph Hellwig <hch at lst.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 78cf1de49b11c0e2edb35cce91ac6c279cc852b3
Author: Jack Steiner <steiner at sgi.com>
Date: Tue Jul 29 22:33:56 2008 -0700
GRU Driver: driver initialization, file & vma ops
This file contains the functions for initializing the driver, handling
file & vma operations and for processing IOCTL requests from the user.
Signed-off-by: Jack Steiner <steiner at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b2fb06fcb6d6c9912b43e61394891e3994d4b613
Author: Jack Steiner <steiner at sgi.com>
Date: Tue Jul 29 22:33:56 2008 -0700
GRU Driver: kernel services header files
This patch contains the header file used to export GRU services to other
kernel drivers such as XPMEM or XPNET.
Signed-off-by: Jack Steiner <steiner at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 13d19498b0446cad2c394f9fbec8149b44a60c6e
Author: Jack Steiner <steiner at sgi.com>
Date: Tue Jul 29 22:33:55 2008 -0700
GRU Driver: driver internal header files
This patch contains header files internal to the GRU driver.
Signed-off-by: Jack Steiner <steiner at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4c921d4d8aa74140597fd8736261837f73ca6e7a
Author: Jack Steiner <steiner at sgi.com>
Date: Tue Jul 29 22:33:54 2008 -0700
GRU Driver: GRU instructions & macros
This patchs contains macros & inline functions used to issue instructions
to the GRU.
Signed-off-by: Jack Steiner <steiner at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 34d8a380d784d1fbea941a68beebdd7f9a3bebdf
Author: Jack Steiner <steiner at sgi.com>
Date: Tue Jul 29 22:33:54 2008 -0700
GRU Driver: hardware data structures
This series of patches adds a driver for the SGI UV GRU. The driver is
still in development but it currently compiles for both x86_64 & IA64.
All simple regression tests pass on IA64. Although features remain to be
added, I'd like to start the process of getting the driver into the
kernel. Additional kernel drivers will depend on services provide by the
GRU driver.
The GRU is a hardware resource located in the system chipset. The GRU
contains memory that is mmaped into the user address space. This memory
is used to communicate with the GRU to perform functions such as
load/store, scatter/gather, bcopy, AMOs, etc. The GRU is directly
accessed by user instructions using user virtual addresses. GRU
instructions (ex., bcopy) use user virtual addresses for operands.
The GRU contains a large TLB that is functionally very similar to
processor TLBs. Because the external contains a TLB with user virtual
address, it requires callouts from the core VM system when certain types
of changes are made to the process page tables. There are several MMUOPS
patches currently being discussed but none has been accepted into the
kernel. The GRU driver is built using version V18 from Andrea Arcangeli.
This patch:
Contains the definitions of the hardware GRU data structures that are used
by the driver to manage the GRU.
[akpm at linux-foundation;org: export hpage_shift]
Signed-off-by: Jack Steiner <steiner at sgi.com>
Cc: "Luck, Tony" <tony.luck at intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c627f9cc046c7cd93b4525d89377fb409e170a18
Author: Jack Steiner <steiner at sgi.com>
Date: Tue Jul 29 22:33:53 2008 -0700
mm: add zap_vma_ptes(): a library function to unmap driver ptes
zap_vma_ptes() is intended to be used by drivers to unmap ptes assigned to the
driver private vmas. This interface is similar to zap_page_range() but is
less general & less likely to be abused.
Needed by the GRU driver.
Signed-off-by: Jack Steiner <steiner at sgi.com>
Cc: Nick Piggin <nickpiggin at yahoo.com.au>
Cc: Hugh Dickins <hugh at veritas.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f718cd4add5aea9d379faff92f162571e356cc5f
Author: Andi Kleen <andi at firstfloor.org>
Date: Tue Jul 29 22:33:52 2008 -0700
sched: make scheduler sysfs attributes sysdev class devices
They are really class devices, but were incorrectly declared. This
leads to crashes with the recent changes that makes non normal sysdevs
use a different prototype.
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Andi Kleen <ak at linux.intel.com>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Pierre Ossman <drzeus-list at drzeus.cx>
Cc: Greg Kroah-Hartman <gregkh at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5cdc98b8f51310f7cca05ad780f18f80dd9571de
Author: Tomas Janousek <tomi at nomi.cz>
Date: Tue Jul 29 22:33:51 2008 -0700
rtc-dev: stop periodic interrupts on device release
Solves http://bugzilla.kernel.org/show_bug.cgi?id=11127
The old rtc.c driver did it and some drivers (like rtc-sh) do it in their
release function, though they should not -- because they should provide
the irq_set_state op and the rtc framework itself should care about it.
This patch makes it do so.
I am aware that some drivers, like rtc-sh, handle userspace PIE sets in
their ioctl op (instead of having the framework call the op), exporting
the irq_set_state op at the same time. The logic in rtc_irq_set_state
should make sure it doesn't matter and the driver should not need to care
stopping periodic interrupts in its release routine any more.
The correct way, in my opinion, should be this:
1) The driver provides the irq_set_state op and does not care closing the
interrupts in its release op.
2) If the driver does not provide the op and handles PIE in the ioctl op, it's
reponsible for closing them in its release op.
3) Something similar for other IRQs, like UIE -- if there's no in-kernel API
like irq_set_state, handle it in ioctl and release ops. The framework will
be responsible either for everything or for nothing. (This will probably
change later.)
Signed-off-by: Tomas Janousek <tomi at nomi.cz>
Acked-by: David Brownell <dbrownell at users.sourceforge.net>
Acked-by: Alessandro Zummo <a.zummo at towertech.it>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8d0b1c51eb8375f88c0886d2e9f71881e19d42a7
Author: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
Date: Tue Jul 29 22:33:49 2008 -0700
gbefb: cmap FIFO timeout
Writes to the cmap fifo while the display is blanked caused cmap FIFO
timeout messages and a wrong colormap. To avoid this the driver now
maintains a colormap in memory and updates the colormap after the display
is unblanked.
Signed-off-by: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
Cc: Krzysztof Helt <krzysztof.h1 at poczta.fm>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6af8bf3d86d55c98af6e453cb920ddc30867e5c7
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Tue Jul 29 22:33:49 2008 -0700
workqueues: add comments to __create_workqueue_key()
Dmitry Adamushko pointed out that the error handling in
__create_workqueue_key() is not clear, add the comment.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Dmitry Adamushko <dmitry.adamushko at gmail.com>
Cc: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit dbacefc9c4f6bd365243db379473ab7041656d90
Author: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
Date: Tue Jul 29 22:33:47 2008 -0700
fs/buffer.c: uninline __remove_assoc_queue()
Uninline the __remove_assoc_queue() function in fs/buffer.c, called at too
many places and too long to really be inlined. Size results:
text data bss dec hex filename
1134606 118840 212992 1466438 166046 vmlinux.old
1134303 118840 212992 1466135 165f17 vmlinux
-303 0 0 -303 -12F +/-
This patch is part of the Linux Tiny project and has been originally
written by Matt Mackall <mpm at selenic.com>.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
Cc: Matt Mackall <mpm at selenic.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d406f66ddb0d7491ddd53e4600c425d76a8a245f
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Tue Jul 29 22:33:46 2008 -0700
omfs: sparse annotations
Missing cpu_to_be64 on some constant assignments.
fs/omfs/dir.c:107:16: warning: incorrect type in assignment (different base types)
fs/omfs/dir.c:107:16: expected restricted __be64 [usertype] i_sibling
fs/omfs/dir.c:107:16: got unsigned long long
fs/omfs/file.c:33:13: warning: incorrect type in assignment (different base types)
fs/omfs/file.c:33:13: expected restricted __be64 [usertype] e_next
fs/omfs/file.c:33:13: got unsigned long long
fs/omfs/file.c:36:24: warning: incorrect type in assignment (different base types)
fs/omfs/file.c:36:24: expected restricted __be64 [usertype] e_cluster
fs/omfs/file.c:36:24: got unsigned long long
fs/omfs/file.c:37:23: warning: incorrect type in assignment (different base types)
fs/omfs/file.c:37:23: expected restricted __be64 [usertype] e_blocks
fs/omfs/file.c:37:23: got unsigned long long
fs/omfs/bitmap.c:74:18: warning: incorrect type in argument 2 (different signedness)
fs/omfs/bitmap.c:74:18: expected unsigned long volatile *addr
fs/omfs/bitmap.c:74:18: got long *<noident>
fs/omfs/bitmap.c:77:20: warning: incorrect type in argument 2 (different signedness)
fs/omfs/bitmap.c:77:20: expected unsigned long volatile *addr
fs/omfs/bitmap.c:77:20: got long *<noident>
fs/omfs/bitmap.c:112:17: warning: incorrect type in argument 2 (different signedness)
fs/omfs/bitmap.c:112:17: expected unsigned long volatile *addr
fs/omfs/bitmap.c:112:17: got long *<noident>
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Acked-by: Bob Copeland <me at bobcopeland.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 32be1d22327743134974c7b2ec1e2a143b6b6f86
Author: Ben Dooks <ben-linux at fluff.org>
Date: Tue Jul 29 22:33:44 2008 -0700
scripts/mod/modpost.c: fix spelling of module and happens
Spelling fixes in scripts/mod/modpost.c
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Cc: Rusty Russell <rusty at rustcorp.com.au>
Cc: Sam Ravnborg <sam at ravnborg.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 07a887d399b84668bc26cd040d699b26ec3086c2
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Jul 29 22:33:44 2008 -0700
remove drivers/serial/v850e_uart.c
The removal of drivers/serial/v850e_uart.c originally was in my v850
removal patch, but it seems it got lost somewhere.
Reported-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Acked-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 836e4b14b41d19d17341a2dd2c49af8dd54e3aac
Author: Paul Mundt <lethal at linux-sh.org>
Date: Tue Jul 29 22:33:43 2008 -0700
USB: m66592-udc: Fix up dev_set_name() badness.
Commit 0031a06e2f07ab0d1bc98c31dbb6801f95f4bf01 converted all of the USB
drivers to use dev_set_name(), though there was a typo on the m66592-udc
conversion that handed off the wrong pointer (we want the struct device
here obviously, not the struct usb_gadget).
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
Cc: Kay Sievers <kay.sievers at vrfy.org>
Cc: Greg Kroah-Hartman <gregkh at suse.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 204b885e7322656284626949e51f292fe61313fa
Author: Joerg Roedel <joerg.roedel at amd.com>
Date: Tue Jul 29 22:33:42 2008 -0700
introduce lower_32_bits() macro
The file kernel.h contains the upper_32_bits macro. This patch adds the
other part, the lower_32_bits macro. Its first use will be in the driver
for AMD IOMMU.
Cc: H. Peter Anvin <hpa at zytor.com>
Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 87547ee95d81ec0ee1503fcaf9c9594469bc2510
Author: Fernando Luis Vazquez Cao <fernando at oss.ntt.co.jp>
Date: Tue Jul 29 22:33:42 2008 -0700
do_try_to_free_page: update comments related to vmscan functions
Signed-off-by: Fernando Luis Vazquez Cao <fernando at oss.ntt.co.jp>
Cc: Hugh Dickins <hugh at veritas.com>
Cc: Nick Piggin <nickpiggin at yahoo.com.au>
Cc: Rik van Riel <riel at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7d03431cf98aaed635524024273668bb8cedadda
Author: Fernando Luis Vazquez Cao <fernando at oss.ntt.co.jp>
Date: Tue Jul 29 22:33:41 2008 -0700
swapfile/vmscan: update comments related to vmscan functions
Signed-off-by: Fernando Luis Vazquez Cao <fernando at oss.ntt.co.jp>
Cc: Hugh Dickins <hugh at veritas.com>
Cc: Nick Piggin <nickpiggin at yahoo.com.au>
Cc: Rik van Riel <riel at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ab33dc09a5c0d2bd6757afa1c2f804c9657daec0
Author: Fernando Luis Vazquez Cao <fernando at oss.ntt.co.jp>
Date: Tue Jul 29 22:33:40 2008 -0700
swap: update function comment of release_pages
Signed-off-by: Fernando Luis Vazquez Cao <fernando at oss.ntt.co.jp>
Cc: Hugh Dickins <hugh at veritas.com>
Cc: Nick Piggin <nickpiggin at yahoo.com.au>
Cc: Rik van Riel <riel at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7e6cbea39aaa32480145915751119227f29f6f7b
Author: Fernando Luis Vazquez Cao <fernando at oss.ntt.co.jp>
Date: Tue Jul 29 22:33:39 2008 -0700
madvise: update function comment of madvise_dontneed
Signed-off-by: Fernando Luis Vazquez Cao <fernando at oss.ntt.co.jp>
Cc: Hugh Dickins <hugh at veritas.com>
Cc: Nick Piggin <nickpiggin at yahoo.com.au>
Cc: Rik van Riel <riel at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 641de9d8f505db055d451b50e6e38117f84e79bb
Author: Uwe Kleine-König <Uwe.Kleine-Koenig at digi.com>
Date: Tue Jul 29 22:33:38 2008 -0700
printk: fix comment for printk ratelimiting
The comment assumed the burst to be one and the ratelimit used to be named
printk_ratelimit_jiffies.
Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig at digi.com>
Cc: Dave Young <hidave.darkstar at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8f3d137e0d6cd470a4e404cbc67480a0febdb0b1
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Tue Jul 29 22:33:38 2008 -0700
Char: mxser, ratelimit ioctl warning
The GET_MAJOR ioctl prints out a warning, make it ratelimited.
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Acked-by: 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 bd673c7c3b1681dbfabab0062e67398dadf806af
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date: Tue Jul 29 22:33:36 2008 -0700
initrd: cast `initrd_start' to `void *'
commit fb6624ebd912e3d6907ca6490248e73368223da9 (initrd: Fix virtual/physical
mix-up in overwrite test) introduced the compiler warning below on mips,
as its virt_to_page() doesn't cast the passed address to unsigned long
internally, unlike on most other architectures:
init/main.c: In function `start_kernel':
init/main.c:633: warning: passing argument 1 of `virt_to_phys' makes pointer from integer without a cast
init/main.c:636: warning: passing argument 1 of `virt_to_phys' makes pointer from integer without a cast
For now, kill the warning by explicitly casting initrd_start to `void *', as
that's the type it should really be.
Reported-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
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 06ac667903ebea8191d4f7e7fa4e0936161e25fe
Author: WANG Cong <xiyou.wangcong at gmail.com>
Date: Tue Jul 29 22:33:34 2008 -0700
uml: fix tty-related build error
/home/wangcong/Projects/linux-2.6/arch/um/drivers/line.c: In function `line_write_interrupt':
/home/wangcong/Projects/linux-2.6/arch/um/drivers/line.c:366: error: `struct tty_ldisc' has no member named `write_wakeup'
/home/wangcong/Projects/linux-2.6/arch/um/drivers/line.c:367: error: `struct tty_ldisc' has no member named `write_wakeup'
Signed-off-by: WANG Cong <wangcong at zeuux.org>
Cc: Jeff Dike <jdike at addtoit.com>
Acked-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 2c203003f64de5fe55ae35712942100d270667fa
Author: Jerome Arbez-Gindre <jeromearbezgindre at gmail.com>
Date: Tue Jul 29 22:33:33 2008 -0700
connector: add a BlackBoard user to connector
Add a BlackBoard user to connector. BlackBoard is part of the TSP GPL
sampling framework (http://savannah.nongnu.org/p/tsp)
[akpm at linux-foundation.org: add comment]
Signed-off-by: Jerome Arbez-Gindre <jeromearbezgindre at gmail.com>
Acked-by: Evgeniy Polyakov <johnpol at 2ka.mipt.ru>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3f1712bac586069d6c891a8201457283b27e8abe
Author: Vegard Nossum <vegard.nossum at gmail.com>
Date: Tue Jul 29 22:33:32 2008 -0700
print_ip_sym(): use %pS
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c389d27b5e643d745f55ffb939b1426060ba63d4
Author: Borislav Petkov <petkovbb at googlemail.com>
Date: Tue Jul 29 22:33:32 2008 -0700
8250.c: port.lock is irq-safe
serial8250_startup() doesn't disable interrupts while taking the &up->port.lock
which might race against the interrupt handler serial8250_interrupt(), which
when entered, will deadlock waiting for the lock to be released.
Signed-off-by: Borislav Petkov <petkovbb at gmail.com>
Tested-by: Ingo Molnar <mingo at elte.hu>
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 5def9a3a22e09c99717f41ab7f07ec9e1a1f3ec8
Author: Mathieu Desnoyers <mathieu.desnoyers at polymtl.ca>
Date: Tue Jul 29 22:33:31 2008 -0700
markers: fix markers read barrier for multiple probes
Paul pointed out two incorrect read barriers in the marker handler code in
the path where multiple probes are connected. Those are ordering reads of
"ptype" (single or multi probe marker), "multi" array pointer, and "multi"
array data access.
It should be ordered like this :
read ptype
smp_rmb()
read multi array pointer
smp_read_barrier_depends()
access data referenced by multi array pointer
The code with a single probe connected (optimized case, does not have to
allocate an array) has correct memory ordering.
It applies to kernel 2.6.26.x, 2.6.25.x and linux-next.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at polymtl.ca>
Cc: "Paul E. McKenney" <paulmck at linux.vnet.ibm.com>
Cc: <stable at kernel.org> [2.6.25.x, 2.6.26.x]
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b68bb2632453a9ca7d10a00d79adf60968cb4c05
Author: David Brownell <dbrownell at users.sourceforge.net>
Date: Tue Jul 29 22:33:30 2008 -0700
rtc: don't return -EBUSY when mutex_lock_interruptible() fails
It was pointed out that the RTC framework handles its mutex locks oddly
... returning -EBUSY when interrupted. This fixes that by returning the
value of mutex_lock_interruptible() (i.e. -EINTR).
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Acked-by: Alessandro Zummo <a.zummo at towertech.it>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 950d442ad053e660538cdaa6efc0e060c2a65062
Author: Julia Lawall <julia at diku.dk>
Date: Tue Jul 29 22:33:28 2008 -0700
drivers/video: release mutex in error handling code
The mutex is released on a successful return, so it would seem that it
should be released on an error return as well.
The semantic patch finds this problem is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@@
expression l;
@@
mutex_lock(l);
... when != mutex_unlock(l)
when any
when strict
(
if (...) { ... when != mutex_unlock(l)
+ mutex_unlock(l);
return ...;
}
|
mutex_unlock(l);
)
// </smpl>
Signed-off-by: Julia Lawall <julia at diku.dk>
Acked-by: Krzysztof Helt <krzysztof.h1 at wp.pl>
Acked-by: Ondrej Zajicek <santiago at crfreenet.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d667b6ddbcdc036a27407c8b2c1243f1dfd69e26
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date: Tue Jul 29 22:33:26 2008 -0700
hpwdt: don't use static flags
Static (read: global) is potential problem. Two threads can corrupt each
other's interrupt status, better avoid this.
Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
Cc: Wim Van Sebroeck <wim at iguana.be>
Cc: Thomas Mingarelli <thomas.mingarelli at hp.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 26c131c71e31973e273adde4027e6a80bde164dc
Author: Jan Beulich <jbeulich at novell.com>
Date: Tue Jul 29 22:33:25 2008 -0700
iscsi_ibft_find: fix modpost warning
Exporting __init functions is wrong.
Signed-off-by: Jan Beulich <jbeulich at novell.com>
Acked-by: Konrad Rzeszutek <konradr at linux.vnet.ibm.com>
Cc: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 126ed36d0edee41c0775906a164ad7e8bef55864
Author: Ben Dooks <ben-linux at fluff.org>
Date: Tue Jul 29 22:33:25 2008 -0700
backlight: ensure platform_lcd on by default
It seems that we need to ensure that the lcd is powered up at start,
otherwise we do not see a display.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Cc: Richard Purdie <rpurdie at rpsys.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit aeed682421a5ebfbf46940e30c3d1caf3bc64304
Author: Li Zefan <lizf at cn.fujitsu.com>
Date: Tue Jul 29 22:33:24 2008 -0700
cpuset: clean up cpuset hierarchy traversal code
Use cpuset.stack_list rather than kfifo, so we avoid memory allocation
for kfifo.
Signed-off-by: Li Zefan <lizf at cn.fujitsu.com>
Signed-off-by: Lai Jiangshan <laijs at cn.fujitsu.com>
Cc: Paul Menage <menage at google.com>
Cc: Cedric Le Goater <clg at fr.ibm.com>
Cc: Balbir Singh <balbir at in.ibm.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: Paul Jackson <pj at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 93a6557558a13f9ff35213efeca483f353c39dd3
Author: Li Zefan <lizf at cn.fujitsu.com>
Date: Tue Jul 29 22:33:23 2008 -0700
cpuset: fix wrong calculation of relax domain level
When multiple cpusets are overlapping in their 'cpus' and hence they
form a single sched domain, the largest sched_relax_domain_level among
those should be used. But when top_cpuset's sched_load_balance is
set, its sched_relax_domain_level is used regardless other sub-cpusets'.
This patch fixes it by walking the cpuset hierarchy to find the largest
sched_relax_domain_level.
Signed-off-by: Lai Jiangshan <laijs at cn.fujitsu.com>
Signed-off-by: Li Zefan <lizf at cn.fujitsu.com>
Cc: Paul Menage <menage at google.com>
Cc: Cedric Le Goater <clg at fr.ibm.com>
Cc: Balbir Singh <balbir at in.ibm.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Reviewed-by: Paul Jackson <pj at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f5393693e96393131a4a2e2743f883986d508503
Author: Lai Jiangshan <laijs at cn.fujitsu.com>
Date: Tue Jul 29 22:33:22 2008 -0700
cpuset: speed up sched domain partition
All child cpusets contain a subset of the parent's cpus, so we can skip
them when partitioning sched domains. This decreases 'csa' greately for
cpusets with multi-level hierarchy.
Signed-off-by: Lai Jiangshan <laijs at cn.fujitsu.com>
Signed-off-by: Li Zefan <lizf at cn.fujitsu.com>
Cc: Paul Menage <menage at google.com>
Cc: Cedric Le Goater <clg at fr.ibm.com>
Cc: Balbir Singh <balbir at in.ibm.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Reviewed-by: Paul Jackson <pj at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8d1e6266f512b3a94ef6d33528ff385f1aea0392
Author: Li Zefan <lizf at cn.fujitsu.com>
Date: Tue Jul 29 22:33:21 2008 -0700
cpuset: a bit cleanup for scan_for_empty_cpusets()
clean up hierarchy traversal code
Signed-off-by: Li Zefan <lizf at cn.fujitsu.com>
Cc: Paul Menage <menage at google.com>
Cc: Cedric Le Goater <clg at fr.ibm.com>
Cc: Balbir Singh <balbir at in.ibm.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: Paul Jackson <pj at sgi.com>
Cc: Cliff Wickman <cpw at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4ef1b0fd61333b3b81ebe29283898c6c84b15c9f
Author: Li Zefan <lizf at cn.fujitsu.com>
Date: Tue Jul 29 22:33:20 2008 -0700
memcg: remove redundant check in move_task()
It's guaranteed by cgroup that old_cgrp != cgrp.
Signed-off-by: Li Zefan <lizf at cn.fujitsu.com>
Cc: Paul Menage <menage at google.com>
Cc: Cedric Le Goater <clg at fr.ibm.com>
Cc: Balbir Singh <balbir at in.ibm.com>
Acked-by: 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 55b6fd0162ace1e0f1b52c8c092565c115127ef6
Author: Li Zefan <lizf at cn.fujitsu.com>
Date: Tue Jul 29 22:33:20 2008 -0700
cgroup: uninline cgroup_has_css_refs()
It's not small enough, and has 2 call sites.
text data bss dec hex filename
12813 1676 4832 19321 4b79 cgroup.o.orig
12775 1676 4832 19283 4b53 cgroup.o
Signed-off-by: Li Zefan <lizf at cn.fujitsu.com>
Cc: Paul Menage <menage at google.com>
Cc: Cedric Le Goater <clg at fr.ibm.com>
Cc: Balbir Singh <balbir at in.ibm.com>
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 36553434f475a84b653e25e74490ee8df43b86d5
Author: Li Zefan <lizf at cn.fujitsu.com>
Date: Tue Jul 29 22:33:19 2008 -0700
cgroup: remove duplicate code in allocate_cg_link()
- just call free_cg_links() in allocate_cg_links()
- the list will get initialized in allocate_cg_links(), so don't init
it twice
Signed-off-by: Li Zefan <lizf at cn.fujitsu.com>
Cc: Paul Menage <menage at google.com>
Cc: Cedric Le Goater <clg at fr.ibm.com>
Cc: Balbir Singh <balbir at in.ibm.com>
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 5a3eb9f6b7c598529f832b8baa6458ab1cbab2c6
Author: Li Zefan <lizf at cn.fujitsu.com>
Date: Tue Jul 29 22:33:18 2008 -0700
cgroup: fix possible memory leak
There's a leak if copy_from_user() returns failure.
Signed-off-by: Li Zefan <lizf at cn.fujitsu.com>
Cc: Paul Menage <menage at google.com>
Cc: Cedric Le Goater <clg at fr.ibm.com>
Cc: Balbir Singh <balbir at in.ibm.com>
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 1d1958f05095a7e9ecbba86235122784a3d1b561
Author: Yinghai Lu <yhlu.kernel at gmail.com>
Date: Tue Jul 29 22:33:16 2008 -0700
mm: remove find_max_pfn_with_active_regions
It has no user now
Also print out info about adding/removing active regions.
Signed-off-by: Yinghai Lu <yhlu.kernel at gmail.com>
Acked-by: Mel Gorman <mel at csn.ul.ie>
Acked-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3971e1a917548977cff71418a7c3575ffbc9571f
Author: Alex Nixon <alex.nixon at citrix.com>
Date: Tue Jul 29 22:33:03 2008 -0700
VFS: increase pseudo-filesystem block size to PAGE_SIZE
This commit:
commit ba52de123d454b57369f291348266d86f4b35070
Author: Theodore Ts'o <tytso at mit.edu>
Date: Wed Sep 27 01:50:49 2006 -0700
[PATCH] inode-diet: Eliminate i_blksize from the inode structure
caused the block size used by pseudo-filesystems to decrease from
PAGE_SIZE to 1024 leading to a doubling of the number of context switches
during a kernbench run.
Signed-off-by: Alex Nixon <Alex.Nixon at citrix.com>
Cc: Andi Kleen <andi at firstfloor.org>
Cc: Jeremy Fitzhardinge <jeremy at goop.org>
Cc: Peter Zijlstra <peterz at infradead.org>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Ian Campbell <Ian.Campbell at eu.citrix.com>
Cc: "Theodore Ts'o" <tytso at mit.edu>
Cc: Alexander Viro <viro at zeniv.linux.org.uk>
Cc: Hugh Dickins <hugh at veritas.com>
Cc: Jens Axboe <jens.axboe at oracle.com>
Cc: <stable at kernel.org> [2.6.25.x, 2.6.26.x]
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit fdac4e69a1fc181652b37ce6a32ab8a56b0f3bcf
Author: Helge Deller <deller at gmx.de>
Date: Tue Jul 29 22:33:01 2008 -0700
sticore: don't activate unsupported GSC STI cards on HPPA
On HPPA there exists some older GSC graphics cards, which need special
graphic-card-BIOS patching to become supported. Since we don't have yet
implemented the patching, it's better to detect such cards in advance,
inform to the user that there are known problems and to not activate the
card.
Problematic GSC cards and BIOS versions are:
* Hyperdrive/Hyperbowl (A4071A) graphics card series:
* ID = 0x2BCB015A (Version 8.04/8)
* ID = 0x2BCB015A (Version 8.04/11)
* Thunder 1 VISUALIZE 48 card:
* ID = 0x2F23E5FC (Version 8.05/9)
* Thunder 2 VISUALIZE 48 XP card:
* ID = 0x2F8D570E (Version 8.05/12)
* Some Hyperion and ThunderHawk GSC cards
Further details are described here:
http://parisc-linux.org/faq/graphics-howto.html
Signed-off-by: Helge Deller <deller at gmx.de>
Cc: Kyle McMartin <kyle at mcmartin.ca>
Cc: Krzysztof Helt <krzysztof.h1 at poczta.fm>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Grant Grundler <grundler at parisc-linux.org>
Cc: Matthew Wilcox <matthew at wil.cx>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9b67c5d48f104aae6118bbb052dd79a15ab9794b
Author: Thomas Renninger <trenn at suse.de>
Date: Tue Jul 29 22:32:59 2008 -0700
acpi cpufreq cleanup: move bailing out of function before locking the mutex
Signed-off-by: Thomas Renninger <trenn at suse.de>
Cc: Andi Kleen <andi at firstfloor.org>
Cc: Len Brown <lenb at kernel.org>
Cc: Dave Jones <davej at codemonkey.org.uk>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a1531acd43310a7e4571d52e8846640667f4c74b
Author: Thomas Renninger <trenn at suse.de>
Date: Tue Jul 29 22:32:58 2008 -0700
cpufreq acpi: only call _PPC after cpufreq ACPI init funcs got called already
Ingo Molnar provided a fix to not call _PPC at processor driver
initialization time in "[PATCH] ACPI: fix cpufreq regression" (git
commit e4233dec749a3519069d9390561b5636a75c7579)
But it can still happen that _PPC is called at processor driver
initialization time.
This patch should make sure that this is not possible anymore.
Signed-off-by: Thomas Renninger <trenn at suse.de>
Cc: Andi Kleen <andi at firstfloor.org>
Cc: Len Brown <lenb at kernel.org>
Cc: Dave Jones <davej at codemonkey.org.uk>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Venkatesh Pallipadi <venkatesh.pallipadi at intel.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 1a4e564b7db999fbe5d88318c96ac8747699d417
Author: Magnus Damm <damm at igel.co.jp>
Date: Tue Jul 29 22:32:57 2008 -0700
resource: add resource_size()
Avoid one-off errors by introducing a resource_size() function.
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Cc: Ben Dooks <ben-linux at fluff.org>
Cc: Jean Delvare <khali at linux-fr.org>
Cc: Paul Mundt <lethal at linux-sh.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e958d3ace7791f33518f0259cd3cf229408b135c
Author: Ben Dooks <ben-linux at fluff.org>
Date: Tue Jul 29 22:32:56 2008 -0700
backlight: give platform_lcd the same name as the platform device.
When registering an platform_lcd, use the name of the platform device
specified in case there are more than one platform_lcd backlights
registered.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Cc: Richard Purdie <rpurdie at rpsys.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 95b1bc20532c18e3f19cd460c8350350c84ffbb2
Author: David Brownell <dbrownell at users.sourceforge.net>
Date: Tue Jul 29 22:28:12 2008 -0700
[MTD] MTD_DEBUG always does compile-time typechecks
The current style for debug messages is to ensure they're always
parsed by the compiler and then subjected to dead code removal.
That way builds won't break only when debug options get enabled,
which is common when they are stripped out early by CPP.
This patch makes CONFIG_MTD_DEBUG adopt that convention.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
commit 771999b65f79264acde4b855e5d35696eca5e80c
Author: akpm at linux-foundation.org <akpm at linux-foundation.org>
Date: Tue Jul 29 22:22:40 2008 -0700
[MTD] DataFlash: bugfix, binary page sizes now handled
The wrong version of the "teach dataflash about binary density" patch
just got merged (v2 not v3) ... this restores the missing updates:
* Fix the cmdlinepart *regression* that caused testing failures (!!)
by restoring the original part labels in relevant cases.
* Don't reference things that don't exist (!)
- An opcode that doesn't even exist for DataFlash
- The part is "at45db642" not "at45db641"
- ID zero in this JEDEC table
* Make the JEDEC probe routine report and handle errors better:
- If the SPI calls fail, return the error codes.
- Don't depend on ordering of table entries.
- Unrecognized ids are different from parts that have no ID.
We won't actually know how to handle them correctly; display
the ID and ignore the chip.
* Move the original block comment about the "legacy" chip ID scheme
back next to the code to which it applies ... not next to the new
JEDEC query code, which uses an entirely different strategy.
* Don't print a guessed erasesize; /proc/mtd has the real value.
And add a few more comments.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Cc: Bryan Wu <cooloney at kernel.org>
Cc: Michael Hennerich <michael.hennerich at analog.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
commit 650da9d0b7c401619c1df2953e975606b8d5dcbb
Author: akpm at linux-foundation.org <akpm at linux-foundation.org>
Date: Tue Jul 29 21:27:14 2008 -0700
[MTD] [NAND] fsl_elbc_nand.c: fix printk warning
drivers/mtd/nand/fsl_elbc_nand.c:890: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'resource_size_t'
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
commit 74216be41a61a809ad17b091068307e3d89f4a2f
Author: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
Date: Wed Jul 30 11:18:42 2008 +0300
[MTD] [NAND] nandsim: support random page read command
Commit 3d45955962496879dead8d4dd70bb9a23b07154b ("subpage read feature
as a way to improve performance") broke nandsim because nandsim does not
support the "random page read" NAND command. This patch adds
corresponding support.
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
commit 96d8b647cfff90c8ff07863866aacdcd9d13cead
Author: Alexey Korolev <akorolev at infradead.org>
Date: Tue Jul 29 13:54:11 2008 +0100
[MTD] [NAND] fix subpage read for small page NAND
Current implementation of subpage read feature for NAND has issues with
small page devices. Small page NAND do not support RNDOUT command.
So subpage feature is not applicable for them.
This patch disables support of subpage for small page NAND.
The code is verified on nandsim(SP NAND simulation) and on LP NAND
devices.
Thanks a lot to Artem for finding this issue.
Signed-off-by: Alexey Korolev <akorolev at infradead.org>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
commit 031cf19e6f63941506c9baf76ac7adac06edcf08
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Wed Jul 30 03:14:01 2008 -0700
net: Make "networking" one-click deselectable.
Use a menuconfig directive to make all of networking support one-click
deselectable from the top-level menu.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 17ef51fce03758736e9051c4360eca237dd0aaeb
Author: Daniel Lezcano <dlezcano at fr.ibm.com>
Date: Wed Jul 30 03:12:31 2008 -0700
ipv6: Fix useless proc net sockstat6 removal
This call is no longer needed, sockstat6 is per namespace so it is
removed at the namespace subsystem destruction.
Signed-off-by: Daniel Lezcano <dlezcano at fr.ibm.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 785957d3e8c6fb37b18bf671923a76dbd8240025
Author: David S. Miller <davem at davemloft.net>
Date: Wed Jul 30 03:03:15 2008 -0700
tcp: MD5: Use MIB counter instead of warning for MD5 mismatch.
From a report by Matti Aarnio, and preliminary patch by Adam Langley.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 8d50b53d66a8a6ae41bafbdcabe401467803f33a
Author: David S. Miller <davem at davemloft.net>
Date: Wed Jul 30 02:37:46 2008 -0700
pkt_sched: Fix OOPS on ingress qdisc add.
Bug report from Steven Jan Springl:
Issuing the following command causes a kernel oops:
tc qdisc add dev eth0 handle ffff: ingress
The problem mostly stems from all of the special case handling of
ingress qdiscs.
So, to fix this, do the grafting operation the same way we do for TX
qdiscs. Which means that dev_activate() and dev_deactivate() now do
the "qdisc_sleeping <--> qdisc" transitions on dev->rx_queue too.
Future simplifications are possible now, mainly because it is
impossible for dev_queue->{qdisc,qdisc_sleeping} to be NULL. There
are NULL checks all over to handle the ingress qdisc special case
that used to exist before this commit.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 0eb5d5ab3ec99bfd22ff16797d95835369ffb25b
Author: Philipp Zabel <philipp.zabel at gmail.com>
Date: Fri Jul 11 17:28:06 2008 +0200
regulator: TI bq24022 Li-Ion Charger driver
This adds a regulator driver for the TI bq24022 Single-Chip
Li-Ion Charger with its nCE and ISET2 pins connected to GPIOs.
Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
Signed-off-by: Liam Girdwood <lg at opensource.wolfsonmicro.com>
commit e53e86c7ae123b11c269b0835c04e1b42ca4baed
Author: Liam Girdwood <lg at opensource.wolfsonmicro.com>
Date: Thu Jul 10 15:48:00 2008 +0100
regulator: maintainers - add maintainers for regulator framework.
Adds Liam Girdwood and Mark Brown as regulator framework maintainers.
Signed-off-by: Liam Girdwood <lg at opensource.wolfsonmicro.com>
commit e941d0ce532daf8d8610b2495c06f787fd587b85
Author: Liam Girdwood <lg at opensource.wolfsonmicro.com>
Date: Wed Apr 30 17:23:59 2008 +0100
regulator: documentation - ABI
This adds documentation describing the sysfs ABI used by the regulator
framework.
Signed-off-by: Liam Girdwood <lg at opensource.wolfsonmicro.com>
commit e7d0fe340557b202dc00135ab3cc877db794a01f
Author: Liam Girdwood <lg at opensource.wolfsonmicro.com>
Date: Wed Apr 30 17:22:50 2008 +0100
regulator: documentation - machine
This adds documenation describing the regulator machine interface.
Signed-off-by: Liam Girdwood <lg at opensource.wolfsonmicro.com>
commit e8695ebe5568921c41c269f4434e17590735865c
Author: Liam Girdwood <lg at opensource.wolfsonmicro.com>
Date: Wed Apr 30 17:20:11 2008 +0100
regulator: documentation - regulator driver
This adds documentation describing the regulator driver interface.
Signed-off-by: Liam Girdwood <lg at opensource.wolfsonmicro.com>
commit 6392776d262fcd290616ff5e4246ee95b22c13f0
Author: Liam Girdwood <lg at opensource.wolfsonmicro.com>
Date: Wed Apr 30 17:19:02 2008 +0100
regulator: documentation - consumer interface
This adds documentation describing the consumer device interface.
Signed-off-by: Liam Girdwood <lg at opensource.wolfsonmicro.com>
commit 8e6f0848be83c5c406ed73a6d7b4bfbf87880eec
Author: Liam Girdwood <lg at opensource.wolfsonmicro.com>
Date: Wed Apr 30 17:16:51 2008 +0100
regulator: documentation - overview
This adds overview documentation describing the regulator framework and
nomenclature used in the interface specific documentation and code.
Signed-off-by: Liam Girdwood <lg at opensource.wolfsonmicro.com>
commit ba7e4763437561763b6cca14a41f1d2a7def23e2
Author: Liam Girdwood <lg at opensource.wolfsonmicro.com>
Date: Wed Apr 30 17:13:42 2008 +0100
regulator: core kbuild files
This patch adds kernel build support for the regulator core.
Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
Signed-off-by: Liam Girdwood <lg at opensource.wolfsonmicro.com>
commit c080909eef2b3e7fba70f57cde3264fba95bdf09
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Wed Apr 30 17:05:33 2008 +0100
regulator: regulator test harness
This provides a virtual regulator test harness which exposes a sysfs
interface for setting power requirements, intended for test purposes only.
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
Signed-off-by: Liam Girdwood <lg at opensource.wolfsonmicro.com>
commit 4b74ff6512492dedea353f89d9b56cb715df0d7f
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Wed Apr 30 16:27:12 2008 +0100
regulator: add support for fixed regulators.
This adds supports for regulator that are not software controlable. It allows
them to coexist in systems with mixed supplies.
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Mike Rapoport <mike at compulab.co.il>
Signed-off-by: Liam Girdwood <lg at opensource.wolfsonmicro.com>
commit 414c70cb91c445ec813b61e16fe4882807e40240
Author: Liam Girdwood <lg at opensource.wolfsonmicro.com>
Date: Wed Apr 30 15:59:04 2008 +0100
regulator: regulator framework core
This adds the regulator framework core.
This framework is designed to provide a generic interface to voltage
and current regulators within the Linux kernel. It's intended to
provide voltage and current control to client or consumer drivers and
also provide status information to user space applications through a
sysfs interface.
The intention is to allow systems to dynamically control regulator
output in order to save power and prolong battery life. This applies
to both voltage regulators (where voltage output is controllable) and
current sinks (where current output is controllable).
This framework safely compiles out if not selected so that client
drivers can still be used in systems with no software controllable
regulators.
Signed-off-by: Liam Girdwood <lg at opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <greg at kroah.com>
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
commit 48d335ba3164ce99cb8847513d0e3b6ee604eb20
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Wed Apr 30 15:50:21 2008 +0100
regulator: fixed regulator interface
This patch adds support for fixed regulators. This class of regulator is
not software controllable but can coexist on machines with software
controlable regulators.
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lg at opensource.wolfsonmicro.com>
commit 4c1184e85cb381121a5273ea20ad31ca3faa0a4f
Author: Liam Girdwood <lg at opensource.wolfsonmicro.com>
Date: Wed Apr 30 15:46:09 2008 +0100
regulator: machine driver interface
This interface is for machine specific code and allows the creation of
voltage/current domains (with constraints) for each regulator. It can
provide regulator constraints that will prevent device damage through
overvoltage or over current caused by buggy client drivers. It also
allows the creation of a regulator tree whereby some regulators are
supplied by others (similar to a clock tree).
Signed-off-by: Liam Girdwood <lg at opensource.wolfsonmicro.com>
Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
commit 571a354b1542a274d88617e1f6703f3fe7a517f1
Author: Liam Girdwood <lg at opensource.wolfsonmicro.com>
Date: Wed Apr 30 15:42:28 2008 +0100
regulator: regulator driver interface
This allows regulator drivers to register their regulators and provide
operations to the core. It also has a notifier call chain for propagating
regulator events to clients.
Signed-off-by: Liam Girdwood <lg at opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
commit e2ce4eaa76214f65a3f328ec5b45c30248115768
Author: Liam Girdwood <lg at opensource.wolfsonmicro.com>
Date: Wed Apr 30 15:10:07 2008 +0100
regulator: consumer device interface
Add support to allow consumer device drivers to control their regulator
power supply.
This uses a similar API to the kernel clock interface in that consumer
drivers can get and put a regulator (like they can with clocks atm) and
get/set voltage, current limit, mode, enable and disable. This should
allow consumers complete control over their supply voltage and current
limit. This also compiles out if not in use so drivers can be reused in
systems with no regulator based power control.
Signed-off-by: Liam Girdwood <lg at opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
commit 4e891910f5fc7b94c720f587686636a88447c5e4
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Tue Jul 8 19:35:13 2008 +0100
[netdrvr] wd: fix build breakage with new NS8390p API
From: Alan Cox <alan at redhat.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 16d78bc255a55d16c0888dde336978d633e80b01
Author: Peter Korsgaard <jacmet at sunsite.dk>
Date: Mon Jul 14 09:07:32 2008 +0200
dm9601: don't do usb transfers of data on stack
dm_{read,write}() were doing USB transfers of data on stack, which isn't
allowed. Fix it by kmalloc'ing a temporary buffer.
Clean up the error handling for short transfers while we're at it.
Signed-off-by: Peter Korsgaard <jacmet at sunsite.dk>
Acked-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 38c080ffa9c1b840390832b42ce8621464ab9f97
Author: Andreas Schwab <schwab at suse.de>
Date: Tue Jul 29 23:59:20 2008 -0700
niu: Fix error checking in niu_ethflow_to_class.
The callers of niu_ethflow_to_class expect zero as error, but it returns
-1 instead.
Signed-off-by: Andreas Schwab <schwab at suse.de>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 4a36702e016947a0ce6c0c024673bb5b16d3f618
Author: Miao Xie <miaox at cn.fujitsu.com>
Date: Tue Jul 29 23:57:58 2008 -0700
IPv6: datagram_send_ctl() should exit immediately when an error occured
When an error occured, datagram_send_ctl() should exit immediately rather than
continue to run the for loop. Otherwise, the variable err might be changed and
the error might be hidden.
Fix this bug by using "goto" instead of "break".
Signed-off-by: Miao Xie <miaox at cn.fujitsu.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit ce0ad7f0952581ba75ab6aee55bb1ed9bb22cf4f
Author: Nick Piggin <npiggin at suse.de>
Date: Wed Jul 30 15:23:13 2008 +1000
powerpc/mm: Lockless get_user_pages_fast() for 64-bit (v3)
Implement lockless get_user_pages_fast for 64-bit powerpc.
Page table existence is guaranteed with RCU, and speculative page references
are used to take a reference to the pages without having a prior existence
guarantee on them.
Signed-off-by: Nick Piggin <npiggin at suse.de>
Signed-off-by: Dave Kleikamp <shaggy at linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
commit 7d2a175b9bf6e9422bebe95130a3c79a25ff4602
Author: Michael Neuling <mikey at neuling.org>
Date: Tue Jul 29 01:13:14 2008 +1000
powerpc: Don't use the wrong thread_struct for ptrace get/set VSX regs
In PTRACE_GET/SETVSRREGS, we should be using the thread we are
ptracing rather than current.
Signed-off-by: Michael Neuling <mikey at neuling.org>
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
commit 1ac42ef844d7c0996f15c6f94f463ac94cb80818
Author: Michael Neuling <mikey at neuling.org>
Date: Tue Jul 29 01:13:14 2008 +1000
powerpc: Fix ptrace buffer size for VSX
Fix cut-and-paste error in the size setting for ptrace buffers for VSX.
Signed-off-by: Michael Neuling <mikey at neuling.org>
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
commit 33b3f03dccc26c377e9689790ecc41079a0c9ca7
Author: Michael Neuling <mikey at neuling.org>
Date: Tue Jul 29 01:13:14 2008 +1000
powerpc: Correctly hookup PTRACE_GET/SETVSRREGS for 32 bit processes
Fix bug where PTRACE_GET/SETVSRREGS are not connected for 32 bit processes.
Signed-off-by: Michael Neuling <mikey at neuling.org>
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
commit 9842727da7d95d8249087148048cc571f967c023
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Mon Jul 28 11:29:56 2008 +1000
ide/powermac: Fix use of uninitialized pointer on media-bay
The current ide-pmac calls media_bay_set_ide_infos() with an
uninitialized "hwif" argument. The proper fix is to split the
allocation of the hwif from its registration in order to properly
setup the mediabay informations before registration.
Acked-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
commit 9ee07f91a1fab61ff0d8d25be43351a049c0a821
Author: Nathan Fontenot <nfont at austin.ibm.com>
Date: Sat Jul 26 04:27:06 2008 +1000
powerpc: Allow non-hcall return values for lparcfg writes
The code to handle writes to /proc/ppc64/lparcfg incorrectly
assumes that the return code from the helper routines to update
processor or memory entitlement return a hcall return value. It
then assumes any non-hcall return value is bad and sets the return
code for the write to be -EIO.
The update_[mp]pp routines can return values other than a hcall
return value. This patch removes the automatic setting of any
return code that is not an hcall return value from these routines
to -EIO.
Signed-off-by: Nathan Fontenot <nfont at austin.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
commit 11c675cef2fbe471dc6103a89b156e65c3630f3a
Author: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Fri May 23 16:22:42 2008 +1000
ipmi/powerpc: Use linux/of_{device,platform}.h instead of asm
Drivers should not include the asm variants anymore
Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
commit e93dc4891df93d7efa59d861fdcbb529a1819343
Merge: 6e86841d05f371b5b9b86ce76c02aaee83352298 56a6d13dfd49d90d72a1a962246206719dd9d143
Author: David S. Miller <davem at davemloft.net>
Date: Tue Jul 29 21:51:00 2008 -0700
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
commit 3a1a8acf690873f0ee2d8a648c2ec185f4294bd2
Merge: 6e86841d05f371b5b9b86ce76c02aaee83352298 cf0d19fb3032ebf2cf8e5217da00f51dc025aa8e
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Wed Jul 30 14:36:03 2008 +1000
Merge commit 'kumar/kumar-next'
commit cf0d19fb3032ebf2cf8e5217da00f51dc025aa8e
Author: Kim Phillips <kim.phillips at freescale.com>
Date: Tue Jul 29 15:29:24 2008 -0500
powerpc/fsl: proliferate simple-bus compatibility to soc nodes
add simple-bus compatible property to soc nodes for 83xx/85xx platforms
that were missing them. Add same to platform probe code.
This fixes SoC device drivers (such as talitos) to succeed in matching
devices present in the soc node.
also update mpc836x_rdk dts to new SEC bindings (overlooked in commit
3fd4473: powerpc/fsl: update crypto node definition and device tree
instances).
Signed-off-by: Kim Phillips <kim.phillips at freescale.com>
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
commit 383795c206946777d87ed5f6d61d6659110f9344
Author: Eric Paris <eparis at redhat.com>
Date: Tue Jul 29 17:07:26 2008 -0400
SELinux: /proc/mounts should show what it can
Given a hosed SELinux config in which a system never loads policy or
disables SELinux we currently just return -EINVAL for anyone trying to
read /proc/mounts. This is a configuration problem but we can certainly
be more graceful. This patch just ignores -EINVAL when displaying LSM
options and causes /proc/mounts display everything else it can. If
policy isn't loaded the obviously there are no options, so we aren't
really loosing any information here.
This is safe as the only other return of EINVAL comes from
security_sid_to_context_core() in the case of an invalid sid. Even if a
FS was mounted with a now invalidated context that sid should have been
remapped to unlabeled and so we won't hit the EINVAL and will work like
we should. (yes, I tested to make sure it worked like I thought)
Signed-off-by: Eric Paris <eparis at redhat.com>
Tested-by: Marc Dionne <marc.c.dionne at gmail.com>
Signed-off-by: James Morris <jmorris at namei.org>
commit dc56e634c807c6be69be8af919f20a746197b87d
Author: Breno Leitao <leitao at linux.vnet.ibm.com>
Date: Tue Jul 22 16:27:20 2008 -0300
S2io: fix statistics flush after a MTU change
On s2io driver, when you change the interface MTU, it invokes a card
reset, which flush some statistics. This patch solves this problem, and
also set the net_device->stats as the default statistics structure,
instead of s2io_nic->stats.
To do that, s2io_nic->stats turned into a staging area, where is saved
statistics of the last hardware statistics query. So, the difference
between the current hardware statistics and s2io_nic->stats, is the
value that should be summed up, in order to get the correct statistics
value, even after a reset.
Signed-off-by: Breno Leitao <leitao at linux.vnet.ibm.com>
Signed-off-by: Jay Vosburgh <fubar at us.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit c7b7b042068cd12b8b155722d24686f70b88ced1
Author: David Brownell <dbrownell at users.sourceforge.net>
Date: Thu Jul 24 17:47:56 2008 -0700
enc28j60: don't specify (wrong) IRQ type
Recent changes to the IRQ framework have made passing the wrong
trigger type to request_irq() become a fatal error. In the case
of the enc28j60 driver, it stopped working in my test harness.
(Specifically: the signal detects "pin change" events, both edges,
not just falling edges. Similarly, other boards might route it
through an inverter. Trigger type are board-specific.)
This fixes that problem by the usual fix of expecting board setup
code to have set up the correct IRQ trigger type. The best known
example of that being x86 setup.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 74dfd9fb0ae390027cb5a908ab065a21158105d5
Author: Stephen Hemminger <shemminger at vyatta.com>
Date: Fri Jul 25 11:46:46 2008 -0700
blackfin_mac: unneeded assignment
skb->dev is set by eth_type_trans already.
Signed-off-by: Stephen Hemminger <shemminger at vyatta.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 16b237dc44c716dbd9aeee4ab8aa9c33a62d5998
Merge: 8051367586314ab005dacead790a3b2e4e3dcc58 ac0a2d0c8ab18045ab217339a71e76c76e186ede
Author: Jeff Garzik <jeff at garzik.org>
Date: Tue Jul 29 18:23:13 2008 -0400
Merge branch 'for-2.6.27' of git://git.marvell.com/mv643xx_eth into upstream-fixes
commit 9fec6060d9e48ed7db0dac0e16d0f0f0e615b7f6
Merge: fece418418f51e92dd7e67e17c5e3fe5a28d3279 6e86841d05f371b5b9b86ce76c02aaee83352298
Author: Anton Vorontsov <cbouatmailru at gmail.com>
Date: Wed Jul 30 02:05:23 2008 +0400
Merge branch 'master' of /home/cbou/linux-2.6
Conflicts:
drivers/power/Kconfig
drivers/power/Makefile
commit 8051367586314ab005dacead790a3b2e4e3dcc58
Author: Steve Wise <swise at opengridcomputing.com>
Date: Sat Jul 26 15:40:56 2008 -0500
cxgb3: Allow 64KB firmware images.
Starting with FW version 7.0, the driver needs to allow larger images.
Signed-off-by: Steve Wise <swise at opengridcomputing.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit ee02fee8f698aee72f43b3ee5fd818393b110402
Author: Michael Hennerich <michael.hennerich at analog.com>
Date: Sun Jul 27 22:45:05 2008 +0800
Blackfin EMAC Driver: Functional power management support
Reprogram MAC address after resume from Suspend Mem
(Blackfin Hibernate looses all CORE and SYSTEM register content)
Signed-off-by: Michael Hennerich <michael.hennerich at analog.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit a50c0c05c3bdead1ac405ca8cefd8dc290043933
Author: Bryan Wu <cooloney at kernel.org>
Date: Sun Jul 27 22:45:04 2008 +0800
Blackfin EMAC Driver: enable TXDWA new feature for new silicon (rev > 0.2)
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit d7b843d393cec677583e1aa971df09b140dcfd5e
Author: Mike Frysinger <vapier.adi at gmail.com>
Date: Sun Jul 27 22:45:03 2008 +0800
Blackfin EMAC Driver: add proper __devinit/__devexit markings
Signed-off-by: Mike Frysinger <vapier.adi at gmail.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 22ae03a190011fa2241e68a6c51369d78039348e
Author: Ayaz Abdulla <aabdulla at nvidia.com>
Date: Fri Jul 25 15:31:29 2008 -0400
forcedeth bug fix: realtek phy 8211c errata
This patch adds support for the realtek 8211c phy. The driver must
perform a hardware reset of the phy due to an errata where the phy could
not detect the link.
Signed-off-by: Ayaz Abdulla <aabdulla at nvidia.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 56a6d13dfd49d90d72a1a962246206719dd9d143
Author: Luis Carlos Cobo <luisca at cozybit.com>
Date: Tue Jul 29 19:59:31 2008 +0200
mac80211: fix mesh beaconing
This patch fixes mesh beaconing, which was broken by "mac80211: revamp
beacon configuration".
Signed-off-by: Luis Carlos Cobo <luisca at cozybit.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 77bbadd5ea893f364a0d1879723037678a03725c
Author: Vegard Nossum <vegard.nossum at gmail.com>
Date: Tue Jul 29 13:31:47 2008 +0200
PS3: gelic: use unsigned long for irqflags
The semantic patch I used was this:
@@
expression lock;
identifier flags;
expression subclass;
@@
- unsigned int flags;
+ unsigned long flags;
...
<+...
(
spin_lock_irqsave(lock, flags)
|
_spin_lock_irqsave(lock)
|
spin_unlock_irqrestore(lock, flags)
|
_spin_unlock_irqrestore(lock, flags)
|
read_lock_irqsave(lock, flags)
|
_read_lock_irqsave(lock)
|
read_unlock_irqrestore(lock, flags)
|
_read_unlock_irqrestore(lock, flags)
|
write_lock_irqsave(lock, flags)
|
_write_lock_irqsave(lock)
|
write_unlock_irqrestore(lock, flags)
|
_write_unlock_irqrestore(lock, flags)
|
spin_lock_irqsave_nested(lock, flags, subclass)
|
_spin_lock_irqsave_nested(lock, subclass)
|
spin_unlock_irqrestore(lock, flags)
|
_spin_unlock_irqrestore(lock, flags)
|
_raw_spin_lock_flags(lock, flags)
|
__raw_spin_lock_flags(lock, flags)
)
...+>
This patch was generated using the Coccinelle framework.
Cc: Masakazu Mokuno <mokuno at sm.sony.co.jp>
Cc: Julia Lawall <julia at diku.dk>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Signed-off-by: Vegard Nossum <vegard.nossum at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 14db74bcc3f7a779cf395a47e26b06a28207571a
Author: Johannes Berg <johannes at sipsolutions.net>
Date: Tue Jul 29 13:22:52 2008 +0200
mac80211: fix cfg80211 hooks for master interface
The master interface is a virtual interface that is registered
to mac80211, changing that does not seem like a good idea at
the moment. However, since it has no sdata, we cannot accept
any configuration for it. This patch makes the cfg80211 hooks
reject any such attempt.
Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit bba95fefb8e31f4799652666d05a4a9aad56e492
Author: Johannes Berg <johannes at sipsolutions.net>
Date: Tue Jul 29 13:22:51 2008 +0200
nl80211: fix dump callbacks
Julius Volz pointed out that the dump callbacks in nl80211 were
broken and fixed one of them. This patch fixes the other three
and also addresses the TODOs there.
Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
Cc: Julius Volz <juliusv at google.com>
Cc: Thomas Graf <tgraf at suug.ch>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit d0f09804144fd9471a13cf4d80e66842c7fa114f
Author: Johannes Berg <johannes at sipsolutions.net>
Date: Tue Jul 29 11:32:07 2008 +0200
mac80211: partially fix skb->cb use
This patch fixes mac80211 to not use the skb->cb over the queue step
from virtual interfaces to the master. The patch also, for now,
disables aggregation because that would still require requeuing,
will fix that in a separate patch. There are two other places (software
requeue and powersaving stations) where requeue can happen, but that is
not currently used by any drivers/not possible to use respectively.
Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 0ccd58fc03f40529f66190b1a41e92a732d2bda8
Author: Larry Finger <Larry.Finger at lwfinger.net>
Date: Mon Jul 28 22:25:08 2008 -0500
rtl8187: Improve wireless statistics for RTL8187B
Wireless statistics produced by the RTL8187B driver are not particularly
informative about the strength of the received signal. From the data sheet
provided by Realtek, I discovered that certain parts of the RX header
should have the information necessary to calculate signal quality and
strength. With testing, it became clear that most of these quantities were
very jittery - only the AGC correlated with the signals expected from nearby
AP's. As a result, the quality and strength are derived from the agc value.
The scaling has been determined so that the numbers are close to those
obtained by b43 under the same conditions. The results are qualitatively
correct.
Statistics derived for the RTL8187 have not been changed.
The RX header variables have been renamed to match the quantites described
in the Realtek data sheet.
Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 1f690d7b549ef9c7424536475501885dd5b54930
Author: Larry Finger <Larry.Finger at lwfinger.net>
Date: Mon Jul 28 22:08:18 2008 -0500
rtl8187: Fix for TX sequence number problem
"mac80211: fix TX sequence numbers" broke rtl8187. This
patch makes the same kind of fix that was done for rt2x00. Note that
this code will have to be reworked for proper sequence numbers on beacons.
In addition, the sequence number has been placed in the hardware state,
not the vif state.
Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 5422399518e8142198df888aab00acdac251f754
Author: Rami Rosen <ramirose at gmail.com>
Date: Thu Jul 24 10:40:37 2008 +0300
mac80211: append CONFIG_ to MAC80211_VERBOSE_PS_DEBUG in net/mac80211/tx.c.
In net/mac80211/tx.c, there are some #ifdef which checks
MAC80211_VERBOSE_PS_DEBUG
(which in fact is never set) instead of
CONFIG_MAC80211_VERBOSE_PS_DEBUG, as should be.
This patch replaces MAC80211_VERBOSE_PS_DEBUG with
CONFIG_MAC80211_VERBOSE_PS_DEBUG in these #ifdef commands in
net/mac80211/tx.c.
Signed-off-by: Rami Rosen <ramirose at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 0b06b2ae0e474fc6378117c832bcd94785a9e975
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Wed Jul 23 18:36:38 2008 -0700
mac80211: fix sparse integer as NULL pointer warning
drivers/net/wireless/mac80211_hwsim.c:503:20: warning: Using plain integer as NULL pointer
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 031211049b71619f7e776521963c082ca453d9fd
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Tue Jul 22 23:50:04 2008 -0700
drivers/net/wireless/iwlwifi/iwl-led.c: printk fix
ia64:
drivers/net/wireless/iwlwifi/iwl-led.c: In function `iwl_get_blink_rate':
drivers/net/wireless/iwlwifi/iwl-led.c:271: warning: long long int format, s64 arg (arg 6)
drivers/net/wireless/iwlwifi/iwl-led.c:271: warning: long long int format, u64 arg (arg 7)
We do not know what type the architecture uses to impement u64 and s64,
hence we must cast the variables for printing.
Cc: Tomas Winkler <tomas.winkler at intel.com>
Cc: John W. Linville <linville at tuxdriver.com>
Cc: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 023a04bebe7030c1e6d5347bd3f27a3e49a1f222
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Mon Jul 14 12:52:08 2008 -0700
mac80211: return correct error return from ieee80211_wep_init
Return the proper error code rather than a hard-coded ENOMEM from
ieee80211_wep_init. Also, print the error code on failure.
Signed-off-by: Jeremy Fitzhardinge <jeremy at goop.org>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 1b0241656b658522a15e7aad570cb8ea6b255a2a
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Mon Jul 14 12:43:23 2008 +0200
mac80211: tx, use dev_kfree_skb_any for beacon_get
Use dev_kfree_skb_any(); instead of dev_kfree_skb();, since
ieee80211_beacon_get function might be called from atomic.
(It's in a fail path.)
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Cc: Johannes Berg <johannes at sipsolutions.net>
Cc: Michael Wu <flamingice at sourmilk.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 9c0ab712c7e40b61063431cae74a3e763535a4e7
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Mon Jul 21 19:06:02 2008 +0200
rt2x00: Clear queue entry flags during initialization
When the queues are being initialized the entry flags fields must be
reset to 0. When this does not happen some entries might still be
marked as "occupied" after an ifdown & ifup cycle which would trigger
errors when the entry is being accessed:
phy0 -> rt2x00queue_write_tx_frame: Error - Arrived at non-free entry in the non-full queue 0.
Please file bug report to http://rt2x00.serialmonkey.com.
This also fixes the mac80211 warning:
------------[ cut here ]------------
WARNING: at net/mac80211/tx.c:1238 ieee80211_master_start_xmit+0x30a/0x350 [mac80211]()
which was triggered by the queue error.
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 74c0ee9b59bdaa81a666d5d58022f847390e4b0c
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Mon Jul 21 11:52:44 2008 +0200
rt2x00: Force full register config after start()
rt2x00 will only perform configuration changes from
mac80211 when the configuration option has changed.
This means it keeps track of the current active configuration
and will check these values when the config() callback function
is used.
However this causes breakage when the interface has been
brought down and up again, since all stored active values
aren't reset while the registers might have.
This is for example the case with rt61pci antenna registers which
will jump to invalid values when the interface has been started.
To make sure a full configuration takes place after the start()
callback function, a new flag is added which will be checked
during config() and skips the "what's changed" phase.
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 4104863fb4a724723d1d5f3cba9d3c5084087e45
Author: Julia Lawall <julia at diku.dk>
Date: Mon Jul 21 11:29:34 2008 +0200
b43legacy: Release mutex in error handling code
The mutex is released on a successful return, so it would seem that it
should be released on an error return as well.
The semantic patch finds this problem is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@@
expression l;
@@
mutex_lock(l);
... when != mutex_unlock(l)
when any
when strict
(
if (...) { ... when != mutex_unlock(l)
+ mutex_unlock(l);
return ...;
}
|
mutex_unlock(l);
)
// </smpl>
Signed-off-by: Julia Lawall <julia at diku.dk>
Signed-off-by: Michael Buesch <mb at bu3sch.de>
Cc: stable <stable at kernel.org>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 80c42affad970c8ebc5ebec4681aef8dadf21c32
Author: Julia Lawall <julia at diku.dk>
Date: Mon Jul 21 09:58:11 2008 +0200
drivers/net/wireless/ipw2100.c: Release mutex in error handling code
The mutex is released on a successful return, so it would seem that it
should be released on an error return as well.
The semantic patch finds this problem is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@@
expression l;
@@
mutex_lock(l);
... when != mutex_unlock(l)
when any
when strict
(
if (...) { ... when != mutex_unlock(l)
+ mutex_unlock(l);
return ...;
}
|
mutex_unlock(l);
)
// </smpl>
Signed-off-by: Julia Lawall <julia at diku.dk>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit e7087a828f8714e464fff18d93618727530dfd89
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sun Jul 20 18:03:58 2008 +0200
rt2x00: Fix memleak when RTS/CTS fails
When sending the RTS/CTS frame fails, we should
free the skb buffer which was created.
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 5adf6d63c1697ce1835daf2b5393488a71ee0dca
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sun Jul 20 18:03:38 2008 +0200
rt2x00: Fix QOS sequence counting
When IEEE80211_TX_CTL_ASSIGN_SEQ is not set,
the driver should disable hardware sequence counting
to make sure the mac80211 provided counter is used.
This fixes QOS sequence counting, since that is one
of the cases where mac80211 provides a seperate
sequence counter.
By moving the sequence counting code to rt2x00queue
we make sure that _all_ frames get the sequence counter,
including RTS/CTS and Beacon frames.
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit b93ce437eba7e0232683326f30d9d1167a872fad
Author: Iwo Mergler <iwo at call-direct.com.au>
Date: Sat Jul 19 16:17:40 2008 +0200
rt2x00: Fix the beacon length bug
When setting up a beacon template, the length of the beacon is
calculated with the assumption that the SKB already contains
the Tx descriptor. In the case of beacons it doesn't.
This patch undoes the damage by adding the Tx descriptor length
to the beacon length. This is safe, because the shortest possible
beacon is longer than the Tx header.
Signed-off-by: Iwo Mergler <Iwo at call-direct.com.au>
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 3e0c1abe748a30bc705a55f71bca8e04a83820f1
Author: Iwo Mergler <iwo at call-direct.com.au>
Date: Sat Jul 19 16:17:16 2008 +0200
rt2x00: Large vendor requests for rt73usb firmware upload and beacons
Switches rt73usb to use large vendor requests for firmware
and beacons. This also fixes the garbled beacon bug.
Signed-off-by: Iwo Mergler <Iwo at call-direct.com.au>
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit ed0dbeeb92bdb1030bcec67e20b294bd2020cb31
Author: Iwo Mergler <iwo at call-direct.com.au>
Date: Sat Jul 19 16:16:54 2008 +0200
rt2x00: Support for large vendor requests
Adds an extra rt2x00 vendor request function to support register
transfers beyond the CSR_CACHE_SIZE / USB packet size limit. This
is useful for firmware uploads, beacon templates and keys, all
of which are to large to do with a single USB request.
Signed-off-by: Iwo Mergler <Iwo at call-direct.com.au>
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit f2fdbc4847e0d3991474949f21aa439c361391db
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sat Jul 19 16:16:12 2008 +0200
rt2x00: Fix EIFS timing value
Olivier reported a difference between the EIFS
values used in the legacy driver and the one in
the rt2x00 drivers.
In rt2x00 the value was
( SIFS + (8 * (IEEE80211_HEADER + ACK_SIZE)) )
which comes down to 314us while the legacy driver uses the value 364us
This was caused because EIFS is: SIFS + DIFS + AckTime
This patch will fix this by adding the DIFS by the above value,
and creating a SHORT_EIFS define which uses the SHORT_DIFS.
Reported-by: Olivier Cornu <o.cornu at gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit ed06387b44f0501f7298b559dc8ddfcd410c8fa0
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sat Jul 19 16:15:42 2008 +0200
rt2x00: Remove duplicate declaration
rt2x00queue_free_skb() was declared twice.
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 256b152b005e319f985f50f2a910a75ba0def74f
Author: Pavel Roskin <proski at gnu.org>
Date: Fri Jul 18 12:56:59 2008 -0400
ath5k: don't enable MSI, we cannot handle it yet
MSI is a nice thing, but we cannot enable it without changing the
interrupt handler. If we do it, we break MSI capable hardware,
specifically AR5006 chipset.
Signed-off-by: Pavel Roskin <proski at gnu.org>
Acked-by: Nick Kossifidis <mickflemm at gmail.com>
Cc: stable <stable at kernel.org>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit bc05116ab33d30342e2b4b1bcc6d6e1184e9df97
Author: Bob Copeland <me at bobcopeland.com>
Date: Fri Jul 18 11:11:21 2008 -0400
ath5k: fix recursive locking in ath5k_beacon_update
ath5k_beacon_update takes sc->lock upon entry. However, it is only
called from within ath5k_config_interface, which already holds the lock.
Remove the unnecessary locking from ath5k_beacon_update.
Signed-off-by: Bob Copeland <me at bobcopeland.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit cb9289cb798502a5010c8f1d8d003842cd1449a4
Author: Denis V. Lunev <den at openvz.org>
Date: Fri Jul 18 10:56:12 2008 +0400
iwlwifi: small compile warnings without CONFIG_IWLWIFI_DEBUG
CC [M] drivers/net/wireless/iwlwifi/iwl-scan.o
drivers/net/wireless/iwlwifi/iwl-scan.c: In function 'iwl_rx_scan_complete_notif':
drivers/net/wireless/iwlwifi/iwl-scan.c:274: warning: unused variable 'scan_notif'
Signed-off-by: Denis V. Lunev <den at openvz.org>
Acked-by: Tomas Winkler <tomasw at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit c0b6a1c9be3acac0f600072ebc2bc6ad3d8c8f76
Author: Denis V. Lunev <den at openvz.org>
Date: Thu Jul 17 13:19:24 2008 +0400
iwlwifi: compilation error when CONFIG_IWLWIFI_DEBUG is not set
CC [M] drivers/net/wireless/iwlwifi/iwl-rfkill.o
drivers/net/wireless/iwlwifi/iwl-led.c: In function 'iwl_led_brightness_set':
drivers/net/wireless/iwlwifi/iwl-led.c:198: error: 'led_type_str' undeclared (first use in this function)
drivers/net/wireless/iwlwifi/iwl-led.c:198: error: (Each undeclared identifier is reported only once
drivers/net/wireless/iwlwifi/iwl-led.c:198: error: for each function it appears in.)
The problem is that led_type_str is defined under CONFIG_IWLWIFI_DEBUG
while IWL_DEBUG is a static inline function in this case. Replace it
with macro.
Signed-off-by: Denis V. Lunev <den at openvz.org>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit fb904907fb1a02a64af9f2d1fb1ef35d963231f9
Author: Brian Cavagnolo <brian at cozybit.com>
Date: Wed Jul 16 12:15:26 2008 -0700
libertas: check bounds and only use decimal for sysfs persistent features.
Some persistent settings were using hex and others decimal. In some cases,
values were set in hex but reported in decimal. Confusing.
Signed-off-by: Brian Cavagnolo <brian at cozybit.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 699669f331a9e459713e4327a468db8fbb8cd60f
Author: Rami Rosen <ramirose at gmail.com>
Date: Wed Jul 16 16:39:56 2008 +0300
iwl-3945: add #ifdef CONFIG_IWL3945_LEDS to avoid compile warning.
When building the wireless-next-2.6 tree with CONFIG_IWL3945 (for building
iwl-3945 driver) and where CONFIG_IWL3945_LEDS is not set,
we get this warning:
drivers/net/wireless/iwlwifi/iwl-3945.c: In function
'iwl3945_pass_packet_to_mac80211':
drivers/net/wireless/iwlwifi/iwl-3945.c:633: warning: unused variable 'hdr'
This patch adds #ifdef to iwl3945_pass_packet_to_mac80211() to avoid this
warning. (The variable 'hdr' is used only if CONFIG_IWL3945_LEDS is set)
Signed-off-by: Rami Rosen <ramirose at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 435307a365ceedc4f4e1813e405f583f434d98e4
Author: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Date: Mon Jul 21 21:18:22 2008 -0300
rfkill: yet more minor kernel-doc fixes
For some stupid reason, I sent and old version of the patch minor kernel
doc-fix patch, and it got merged before I noticed the problem. This is an
incremental fix on top.
Signed-off-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Acked-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 064af1117b4aa64a0e52f6b741df7356ef055142
Author: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Date: Mon Jul 21 21:18:20 2008 -0300
rfkill: mutex fixes
There are two mutexes in rfkill:
rfkill->mutex, which protects some of the fields of a rfkill struct, and is
also used for callback serialization.
rfkill_mutex, which protects the global state, the list of registered
rfkill structs and rfkill->claim.
Make sure to use the correct mutex, and to not miss locking rfkill->mutex
even when we already took rfkill_mutex.
Signed-off-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Acked-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit f1b23361a0f15497d4c6795a2935b2e98064ddfb
Author: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Date: Mon Jul 21 21:18:19 2008 -0300
rfkill: document the rfkill struct locking (v2)
Reorder fields in struct rfkill and add comments to make it clear
which fields are protected by rfkill->mutex.
Signed-off-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Acked-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 37f55e9d78d1b63047b1b7ae175cdce650547ba8
Author: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Date: Mon Jul 21 21:18:18 2008 -0300
rfkill: fix led-trigger unregister order in error unwind
rfkill needs to unregister the led trigger AFTER a call to
rfkill_remove_switch(), otherwise it will not update the LED state,
possibly leaving it ON when it should be OFF.
To make led-trigger unregistering safer, guard against unregistering a
trigger twice, and also against issuing trigger events to a led trigger
that was unregistered. This makes the error unwind paths more resilient.
Refer to "rfkill: Register LED triggers before registering switch".
Signed-off-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Acked-by: Ivo van Doorn <IvDoorn at gmail.com>
Cc: Michael Buesch <mb at bu3sch.de>
Cc: Dmitry Baryshkov <dbaryshkov at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 2fd9b2212e25e6411b6f309707f4e2683d164250
Author: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Date: Mon Jul 21 21:18:17 2008 -0300
rfkill: document rfkill_force_state as required (v2)
While the rfkill class does work with just get_state(), it doesn't work
well on devices that are subject to external events that cause rfkill state
changes.
Document that rfkill_force_state() is required in those cases.
Signed-off-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Acked-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 734b5aa911dc65f4563048f069dfc631c9aa7de7
Author: Bob Copeland <me at bobcopeland.com>
Date: Tue Jul 15 13:07:16 2008 -0400
ath5k: use positive logic for HP laptop LEDs
Helge Deller reports that HP laptops (NC4010 and NC6000) use active-
high signals to turn on the LEDs. Previous code used active-low for
all devices.
Signed-off-by: Bob Copeland <me at bobcopeland.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 3e4242b99ce46fed82aa7f40ad5a1817a2b3bd45
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Tue Jul 15 17:44:21 2008 +0200
Ath5k: suspend/resume fixes
- free and re-request irq since it might have changed during suspend
- disable and enable msi
- don't set D0 state of the device, it's already done by the PCI layer
- do restore_state before enable_device, it's safer
- check ath5k_init return value
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Acked-by: Nick Kossifidis <mickflemm at gmail.com>
Cc: Luis R. Rodriguez <mcgrof at gmail.com>
Cc: Jesse Barnes <jbarnes at virtuousgeek.org>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit e86600c7b4e9b9b22ba51620613d6159bf5cf504
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Tue Jul 15 17:44:43 2008 +0200
Ath5k: fix dma operation
Don't sync
- coherent mapping (descriptors)
- before unmap, it's useless
- (wrongly anyway -- for_cpu) beacon skb, it's just mapped,
so by the device yet
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Acked-by: Nick Kossifidis <mickflemm at gmail.com>
Cc: Luis R. Rodriguez <mcgrof at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 274c7c3638cd027b46f76d0caef96c1bad8b6701
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Tue Jul 15 17:44:20 2008 +0200
Ath5k: flush work
Make sure that the irq is not in progress after stop. This means
two things:
- ensure the intr setting register is set by flushing posted values
- call synchronize_irq() after that
Also flush stop tx write, inform callers of the tx stop about still
pending transfers (unsuccessful stop) and finally don't wait another
3ms in ath5k_rx_stop, since ath5k_hw_stop_rx_dma ensures transfer to
be finished.
Make sure all writes will be ordered in respect to locks by mmiowb().
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Acked-by: Nick Kossifidis <mickflemm at gmail.com>
Cc: Luis R. Rodriguez <mcgrof at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 10488f8ad62be3b860bad74e60b4fe6ab87aece3
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Tue Jul 15 17:44:19 2008 +0200
Ath5k: kill tasklets on shutdown
Don't forget to kill tasklets on stop to not panic if they
fire after freeing some structures.
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Acked-by: Nick Kossifidis <mickflemm at gmail.com>
Cc: Luis R. Rodriguez <mcgrof at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 3a0f2c871849f23c1070965bf94dec3f9c0b479d
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Tue Jul 15 17:44:18 2008 +0200
Ath5k: fix memory corruption
When signal is noisy, hardware can use all RX buffers and since the last
entry in the list is self-linked, it overwrites the entry until we link
new buffers.
Ensure that we don't free this last one until we are 100% sure that it
is not used by the hardware anymore to not cause memory curruption as
can be seen below.
This is done by checking next buffer in the list. Even after that we
know that the hardware refetched the new link and proceeded further
(the next buffer is ready) we can finally free the overwritten buffer.
We discard it since the status in its descriptor is overwritten (OR-ed
by new status) too.
=============================================================================
BUG kmalloc-4096: Poison overwritten
-----------------------------------------------------------------------------
INFO: 0xffff810067419060-0xffff810067419667. First byte 0x8 instead of 0x6b
INFO: Allocated in dev_alloc_skb+0x18/0x30 age=1118 cpu=1 pid=0
INFO: Freed in skb_release_data+0x85/0xd0 age=1105 cpu=1 pid=3718
INFO: Slab 0xffffe200019d0600 objects=7 used=0 fp=0xffff810067419048 flags=0x40000000000020c3
INFO: Object 0xffff810067419048 @offset=4168 fp=0xffff81006741c120
Bytes b4 0xffff810067419038: 4f 0b 02 00 01 00 00 00 5a 5a 5a 5a 5a 5a 5a 5a O.......ZZZZZZZZ
Object 0xffff810067419048: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk
Object 0xffff810067419058: 6b 6b 6b 6b 6b 6b 6b 6b 08 42 30 00 00 0b 6b 80 kkkkkkkk.B0...k.
Object 0xffff810067419068: f0 5d 00 4f 62 08 a3 64 00 0c 42 16 52 e4 f0 5a 360].Ob.243d..B.R344360Z
Object 0xffff810067419078: 68 81 00 00 7b a5 b4 be 7d 3b 8f 53 cd d5 de 12 h...{245264276};.S315325336.
Object 0xffff810067419088: 96 10 0b 89 48 54 23 41 0f 4e 2d b9 37 c3 cb 29 ....HT#A.N-2717303313)
Object 0xffff810067419098: d1 e0 de 14 8a 57 2a cc 3b 44 0d 78 7a 19 12 15 321340336..W*314;D.xz...
Object 0xffff8100674190a8: a9 ec d4 35 a8 10 ec 8c 40 a7 06 0a 51 a7 48 bb 2513543245250.354. at 247..Q247H273
Object 0xffff8100674190b8: 3e cf a1 c7 38 60 63 3f 51 15 c7 20 eb ba 65 30 >Ï¡3078`c?Q.307.353272e0
Redzone 0xffff81006741a048: bb bb bb bb bb bb bb bb 273273273273273273273273
Padding 0xffff81006741a088: 5a 5a 5a 5a 5a 5a 5a 5a ZZZZZZZZ
Pid: 3297, comm: ath5k_pci Not tainted 2.6.26-rc8-mm1_64 #427
Call Trace:
[<ffffffff802a7306>] print_trailer+0xf6/0x150
[<ffffffff802a7485>] check_bytes_and_report+0x125/0x180
[<ffffffff802a75dc>] check_object+0xac/0x260
[<ffffffff802a9308>] __slab_alloc+0x368/0x6d0
[<ffffffff80544f82>] ? wireless_send_event+0x142/0x310
[<ffffffff804b1bd4>] ? __alloc_skb+0x44/0x150
[<ffffffff80544f82>] ? wireless_send_event+0x142/0x310
[<ffffffff802aa853>] __kmalloc_track_caller+0xc3/0xf0
[<ffffffff804b1bfe>] __alloc_skb+0x6e/0x150
[... stack snipped]
FIX kmalloc-4096: Restoring 0xffff810067419060-0xffff810067419667=0x6b
FIX kmalloc-4096: Marking all objects used
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Acked-by: Nick Kossifidis <mickflemm at gmail.com>
Cc: Luis R. Rodriguez <mcgrof at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 605a0bd66d9d55e9ba46da1a9e5140c68bdf6d85
Author: Johannes Berg <johannes at sipsolutions.net>
Date: Tue Jul 15 10:10:01 2008 +0200
mac80211: remove IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE flag
I forgot this in the previous patch that made it unused.
Signed-off-by: Johannes Berg <johannes at sipsolutions.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 7cb93181629c613ee2b8f4ffe3446f8003074842
Author: Adrian Bunk <bunk at kernel.org>
Date: Wed Jul 30 02:18:26 2008 +0900
mm/hugetlb.c must #include <asm/io.h>
This patch fixes the following build error on sh caused by
commit aa888a74977a8f2120ae9332376e179c39a6b07d
(hugetlb: support larger than MAX_ORDER):
<-- snip -->
...
CC mm/hugetlb.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/mm/hugetlb.c: In function 'alloc_bootmem_huge_page':
/home/bunk/linux/kernel-2.6/git/linux-2.6/mm/hugetlb.c:958: error: implicit declaration of function 'virt_to_phys'
make[2]: *** [mm/hugetlb.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 193f3c2f1531ec9755a87a33038fba3ee29f6ca5
Author: Paul Mundt <lethal at linux-sh.org>
Date: Wed Jul 30 02:16:12 2008 +0900
video: Fix up hp6xx driver build regressions.
This is some more fallout from the header reorganization, fix up the
paths accordingly.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit cc8dccdc74c06ea91e6979130b742fef44e4b0c4
Author: Paul Mundt <lethal at linux-sh.org>
Date: Wed Jul 30 02:15:20 2008 +0900
sh: defconfig updates.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 9b4d10ff247a440d3d4ec130866f7f5b7d1c7c14
Author: Paul Mundt <lethal at linux-sh.org>
Date: Wed Jul 30 01:01:08 2008 +0900
sh: Kill off stray mach-rsk7203 reference.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit c2697968c012cfdba2d92fa6e27e3e34f918af2f
Author: Paul Mundt <lethal at linux-sh.org>
Date: Wed Jul 30 00:56:39 2008 +0900
serial: sh-sci: Fix up SH7760/SH7780/SH7785 early printk regression.
As noted by Manuel:
Commit c63847a3621d2bac054f5709783860ecabd0ee7e ("sh: Add
SCIF2 support for SH7763.") broke build with CONFIG_EARLY_PRINTK
enabled for me (SH7760):
CC arch/sh/kernel/early_printk.o
/mnt/work/sh7760/kernel/linux-2.6.git/arch/sh/kernel/early_printk.c: In function 'scif_sercon_putc':
/mnt/work/sh7760/kernel/linux-2.6.git/arch/sh/kernel/early_printk.c:84: error: implicit declaration of function 'sci_SCFDR_in'
Move the SH7763 definitions out on their own, so they don't create additional
confusion within the SH7760/SH7780/SH7785 block. Restore the deleted
SCFDR definition for these parts.
Reported-by: Manuel Lauss <mano at roarinelk.homelinux.net>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit c8b5d9dcbc94ae5e7d9ed647246df4454d25332e
Author: Paul Mundt <lethal at linux-sh.org>
Date: Wed Jul 30 00:13:39 2008 +0900
sh: Move out individual boards without mach groups.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit c170f86e31410cc38971c1dedd8b25885e6e43b6
Author: Paul Mundt <lethal at linux-sh.org>
Date: Tue Jul 29 23:12:25 2008 +0900
sh: Make sure AT_SYSINFO_EHDR is exposed to userspace in asm/auxvec.h.
Presently this is protected by a CONFIG_VSYSCALL ifdef so we don't
inadvertently trigger the creation of the gate VMA on CPUs where we don't
enable the vDSO, which is obviously not visible to userspace. Fix this up
by adding in an ifndef __KERNEL__ check at the same time.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 11589418a1c4cf68be9367f802898d35e07809c4
Author: Mark Brown <broonie at opensource.wolfsonmicro.com>
Date: Tue Jul 29 11:42:23 2008 +0100
ALSA: ASoC: Export dapm_reg_event() fully
dapm_reg_event() is used by devices using SND_SOC_DAPM_REG() so needs to
be exported to support building them as modules and prototyped to avoid
sparse warnings and potential build issues.
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 51f3547d619956e9b428bfff17004d8f4d259a02
Author: Paul Mundt <lethal at linux-sh.org>
Date: Tue Jul 29 22:52:49 2008 +0900
sh: Allow SH-3 and SH-5 to use common headers.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 93dc544cf4892b9188d7d0d4946b0394020b4551
Author: Paul Mundt <lethal at linux-sh.org>
Date: Tue Jul 29 22:46:55 2008 +0900
sh: Provide common CPU headers, prune the SH-2 and SH-2A directories.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 1795cf48b322b4d19230a40dbe7181acedd34a94
Author: Adrian McMenamin <adrian at mcmen.demon.co.uk>
Date: Tue Jul 29 22:10:56 2008 +0900
sh/maple: clean maple bus code
This patch cleans up the handling of the maple bus queue to remove
the risk of races when adding packets. It also removes references to the
redundant connect and disconnect functions.
Signed-off-by: Adrian McMenamin <adrian at mcmen.demon.co.uk>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 0764bff445bb13cd17e41b6ab196ef83c23c6c17
Author: Paul Mundt <lethal at linux-sh.org>
Date: Tue Jul 29 22:10:01 2008 +0900
sh: More header path fixups for mach dir refactoring.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 939a24a6df24649cea9fd0ff54fe71ee0dc1d61e
Author: Paul Mundt <lethal at linux-sh.org>
Date: Tue Jul 29 21:41:37 2008 +0900
sh: Move out the solution engine headers to arch/sh/include/mach-se/
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit e565b518ec3a62aebf54da31c65bb6036bb5a276
Author: Magnus Damm <damm at igel.co.jp>
Date: Tue Jul 29 20:57:38 2008 +0900
sh: I2C fix for AP325RXA and Migo-R
Fix recently introduced I2C build breakage on AP325RXA and Migo-R.
Reported-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Magnus Damm <damm at igel.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit da2014a2b080e7f3024a4eb6917d47069ad9620b
Author: Paul Mundt <lethal at linux-sh.org>
Date: Tue Jul 29 21:01:19 2008 +0900
sh: Shuffle the board directories in to mach groups.
This flattens out the board directories in to individual mach groups,
we will use this for getting rid of unneeded directories, simplifying
the build system, and becoming more coherent with the refactored
arch/sh/include topology.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 71b8064e7df5698520d73b4c1566a3dbc98eb9ef
Author: Paul Mundt <lethal at linux-sh.org>
Date: Tue Jul 29 20:20:36 2008 +0900
sh: dma-sh: Fix up dreamcast dma.h mach path.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit cfb81f361a3e73bb4eb7207a88f720e2f652dd63
Author: Paul Mundt <lethal at linux-sh.org>
Date: Tue Jul 29 20:19:43 2008 +0900
sh: Switch KBUILD_DEFCONFIG to shx3_defconfig.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit f42b7e3dbe1e2c004a47aa89f09137ee5f04499d
Author: Paul Mundt <lethal at linux-sh.org>
Date: Tue Jul 29 20:12:51 2008 +0900
sh: Add ARCH_DEFCONFIG entries for sh and sh64.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 877db3c1af24a65f78ae865b1fb642165e065a8b
Author: Dmitry Baryshkov <dbaryshkov at gmail.com>
Date: Tue Jul 29 11:42:22 2008 +0100
ALSA: ASoC: Update Poodle to current ASoC API
Signed-off-by: Dmitry Baryshkov <dbaryshkov at gmail.com>
Cc: Richard Purdie <rpurdie at rpsys.net>
Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit be41e941d5f1a48bde7f44d09d56e8d2605f98e1
Author: Timur Tabi <timur at freescale.com>
Date: Mon Jul 28 17:04:39 2008 -0500
ALSA: asoc: restrict sample rate and size in Freescale MPC8610 sound drivers
The Freescale MPC8610 SSI device has the option of using one clock for both
transmit and receive (synchronous mode), or independent clocks (asynchronous).
The SSI driver, however, programs the SSI into synchronous mode and then
tries to program the clock registers independently. The result is that the wrong
sample size is usually generated during recording.
This patch fixes the discrepancy by restricting the sample rate and sample size
of the playback and capture streams. The SSI driver remembers which stream
is opened first. When a second stream is opened, that stream is constrained
to the same sample rate and size as the first stream.
A future version of this driver will lift the sample size restriction.
Supporting independent sample rates is more difficult, because only certain
codecs provide dual independent clocks.
Signed-off-by: Timur Tabi <timur at freescale.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit a7b815169aae65072017efb1fba9dcecc82ba7c1
Author: Huang Weiyi <weiyi.huang at gmail.com>
Date: Sat Jul 26 20:43:01 2008 +0800
ALSA: sound/soc/pxa/tosa.c: removed duplicated include
Removed duplicated include <asm/arch/tosa.h> in
sound/soc/pxa/tosa.c.
Signed-off-by: Huang Weiyi <weiyi.huang at gmail.com>
Acked-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 8978b74253280d59e97cf49a3ec2c0cbccd5b801
Author: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Date: Tue Jul 29 13:38:53 2008 +0900
generic, x86: fix add iommu_num_pages helper function
This IOMMU helper function doesn't work for some architectures:
http://marc.info/?l=linux-kernel&m=121699304403202&w=2
It also breaks POWER and SPARC builds:
http://marc.info/?l=linux-kernel&m=121730388001890&w=2
Currently, only x86 IOMMUs use this so let's move it to x86 for
now.
Reported-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 35780c8ea7ad5c6d5483244d5f5bf37176fda86a
Merge: 6ce37a58e334ef773f88283939afc9f4965c7697 6e86841d05f371b5b9b86ce76c02aaee83352298
Author: Ingo Molnar <mingo at elte.hu>
Date: Tue Jul 29 12:10:50 2008 +0200
Merge commit 'v2.6.27-rc1' into x86/urgent
commit ed8486243379ef3e6c61363df915882945c0eaec
Author: Avi Kivity <avi at qumranet.com>
Date: Tue Jul 29 11:30:57 2008 +0300
KVM: Advertise synchronized mmu support to userspace
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit e930bffe95e1e886a1ede80726ea38df5838d067
Author: Andrea Arcangeli <andrea at qumranet.com>
Date: Fri Jul 25 16:24:52 2008 +0200
KVM: Synchronize guest physical memory map to host virtual memory map
Synchronize changes to host virtual addresses which are part of
a KVM memory slot to the KVM shadow mmu. This allows pte operations
like swapping, page migration, and madvise() to transparently work
with KVM.
Signed-off-by: Andrea Arcangeli <andrea at qumranet.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 604b38ac0369bd50fcbb33344aa5553c071009f7
Author: Andrea Arcangeli <andrea at qumranet.com>
Date: Fri Jul 25 16:32:03 2008 +0200
KVM: Allow browsing memslots with mmu_lock
This allows reading memslots with only the mmu_lock hold for mmu
notifiers that runs in atomic context and with mmu_lock held.
Signed-off-by: Andrea Arcangeli <andrea at qumranet.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit a1708ce8a362c4999f1201237ae7b77c4d13af82
Author: Andrea Arcangeli <andrea at qumranet.com>
Date: Fri Jul 25 16:26:39 2008 +0200
KVM: Allow reading aliases with mmu_lock
This allows the mmu notifier code to run unalias_gfn with only the
mmu_lock held. Only alias writes need the mmu_lock held. Readers will
either take the slots_lock in read mode or the mmu_lock.
Signed-off-by: Andrea Arcangeli <andrea at qumranet.com>
Signed-off-by: Avi Kivity <avi at qumranet.com>
commit 4864841a34ad77a5054f20d18453ae38a926afd8
Author: Nobuhiro Iwamatsu <iwamatsu.nobuhiro at renesas.com>
Date: Tue Jul 29 14:37:25 2008 +0900
sh: Fix compile error of Solution Engine
When I compiled Solution Engine, this become compile error
because plaform device of sh_eth device becomes enable.
When sh7710/sh7712 which could use sh_eth was chosen,
revised it so that platform device of sh_eth device became enable.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro at renesas.com>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 6e86841d05f371b5b9b86ce76c02aaee83352298
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jul 28 19:40:31 2008 -0700
Linux 2.6.27-rc1
commit 7874d35173d549c1a2b2f77c4b1f94379fa65698
Merge: 5dfb66ba8c4a96eb732942c9f78629e4db1a51d4 8c79873da0d2bedf4ad6b868c54e426bb0a2fe38
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jul 28 18:16:26 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: turn Waker into a thread, not a process
lguest: Enlarge virtio rings
lguest: Use GSO/IFF_VNET_HDR extensions on tun/tap
lguest: Remove 'network: no dma buffer!' warning
lguest: Adaptive timeout
lguest: Tell Guest net not to notify us on every packet xmit
lguest: net block unneeded receive queue update notifications
lguest: wrap last_avail accesses.
lguest: use cpu capability accessors
lguest: virtio-rng support
lguest: Support assigning a MAC address
lguest: Don't leak /dev/zero fd
lguest: fix verbose printing of device features.
lguest: fix switcher_page leak on unload
lguest: Guest int3 fix
lguest: set max_pfn_mapped, growl loudly at Yinghai Lu
commit 5dfb66ba8c4a96eb732942c9f78629e4db1a51d4
Merge: 1d9b9f6a53d77ed801ba875f937d6dabbfc381ce 424f525a1241351da947fb48a938128ddd774511
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jul 28 18:15:41 2008 -0700
Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd
* 'for-linus' of git://git.o-hand.com/linux-mfd:
mfd: accept pure device as a parent, not only platform_device
mfd: add platform_data to mfd_cell
mfd: Coding style fixes
mfd: Use to_platform_device instead of container_of
commit 1d9b9f6a53d77ed801ba875f937d6dabbfc381ce
Merge: a3ad7f128c637b7612ebeacb1f85fec933bb1195 12c0b20fa4afb5c8a377d6987fb2dcf353e1dce1
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jul 28 18:14:24 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: (21 commits)
x86/PCI: use dev_printk when possible
PCI: add D3 power state avoidance quirk
PCI: fix bogus "'device' may be used uninitialized" warning in pci_slot
PCI: add an option to allow ASPM enabled forcibly
PCI: disable ASPM on pre-1.1 PCIe devices
PCI: disable ASPM per ACPI FADT setting
PCI MSI: Don't disable MSIs if the mask bit isn't supported
PCI: handle 64-bit resources better on 32-bit machines
PCI: rewrite PCI BAR reading code
PCI: document pci_target_state
PCI hotplug: fix typo in pcie hotplug output
x86 gart: replace to_pages macro with iommu_num_pages
x86, AMD IOMMU: replace to_pages macro with iommu_num_pages
iommu: add iommu_num_pages helper function
dma-coherent: add documentation to new interfaces
Cris: convert to using generic dma-coherent mem allocator
Sh: use generic per-device coherent dma allocator
ARM: support generic per-device coherent dma mem
Generic dma-coherent: fix DMA_MEMORY_EXCLUSIVE
x86: use generic per-device dma coherent allocator
...
commit a3ad7f128c637b7612ebeacb1f85fec933bb1195
Merge: 9b79022ca909b66e2cd0cfd9248f832fc165f77f 00eabe7c4478f38b42d632763c4878ced5a1f25c
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jul 28 18:13:48 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: fix msleep compile error
commit 9b79022ca909b66e2cd0cfd9248f832fc165f77f
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jul 28 17:54:21 2008 -0700
Fix 'get_user_pages_fast()' with non-page-aligned start address
Alexey Dobriyan reported trouble with LTP with the new fast-gup code,
and Johannes Weiner debugged it to non-page-aligned addresses, where the
new get_user_pages_fast() code would do all the wrong things, including
just traversing past the end of the requested area due to 'addr' never
matching 'end' exactly.
This is not a pretty fix, and we may actually want to move the alignment
into generic code, leaving just the core code per-arch, but Alexey
verified that the vmsplice01 LTP test doesn't crash with this.
Reported-and-tested-by: Alexey Dobriyan <adobriyan at gmail.com>
Debugged-by: Johannes Weiner <hannes at saeurebad.de>
Cc: Nick Piggin <npiggin at suse.de>
Cc: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e542713529e323ff09d7aeb5806cf29f6f160f53
Author: Dan Williams <dan.j.williams at intel.com>
Date: Mon Jul 28 23:28:06 2008 -0700
md: do not count blocked devices as spares
remove_and_add_spares() assumes that failed devices have been hot-removed
from the array. Removal is skipped in the 'blocked' case so do not count a
device in this state as 'spare'.
Signed-off-by: Dan Williams <dan.j.williams at intel.com>
commit df10cfbc4d7ab93260d997df754219d390d62a9d
Author: Dan Williams <dan.j.williams at intel.com>
Date: Mon Jul 28 23:10:39 2008 -0700
md: do not progress the resync process if the stripe was blocked
handle_stripe will take no action on a stripe when waiting for userspace
to unblock the array, so do not report completed sectors.
Signed-off-by: Dan Williams <dan.j.williams at intel.com>
commit 6de9c6481d47c6da5f8b81f75a5c24c69c366f37
Author: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Date: Tue Jul 29 09:16:33 2008 +0900
sh: Proper __put_user_asm() size mismatch fix.
This fixes up the workaround in 2b4b2bb42137c779ef0084de5df66ff21b4cd86e
and cleans up __put_user_asm() to get the sizing right from the onset.
Signed-off-by: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit d27e0854d5773fffe1a1d475032b715d124325ae
Author: Paul Mundt <lethal at linux-sh.org>
Date: Tue Jul 29 09:15:01 2008 +0900
sh: Stub in a dummy ENTRY_OFFSET for uImage offset calculation.
If none is defined, provide a sane default, as we do for the other
options.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 8c79873da0d2bedf4ad6b868c54e426bb0a2fe38
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Tue Jul 29 09:58:38 2008 -0500
lguest: turn Waker into a thread, not a process
lguest uses a Waker process to break it out of the kernel (ie.
actually running the guest) when file descriptor needs attention.
Changing this from a process to a thread somewhat simplifies things:
it can directly access the fd_set of things to watch. More
importantly, it means that the Waker can see Guest memory correctly,
so /dev/vring file descriptors will work as anticipated (the
alternative is to actually mmap MAP_SHARED, but you can't do that with
/dev/zero).
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit 0f0c4fab8284f3b886b2e1e0e317e3bb8de176b3
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Tue Jul 29 09:58:37 2008 -0500
lguest: Enlarge virtio rings
With big packets, 128 entries is a little small.
Guest -> Host 1GB TCP:
Before: 8.43625 seconds xmit 95640 recv 198266 timeout 49771 usec 1252
After: 8.01099 seconds xmit 49200 recv 102263 timeout 26014 usec 2118
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit 398f187d74b89d5ab198fcf9b8d86edbefecec4d
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Tue Jul 29 09:58:37 2008 -0500
lguest: Use GSO/IFF_VNET_HDR extensions on tun/tap
Guest -> Host 1GB TCP:
Before 20.1974 seconds xmit 214510 recv 5 timeout 214491 usec 278
After 8.43625 seconds xmit 95640 recv 198266 timeout 49771 usec 1252
Host -> Guest 1GB TCP:
Before: Seconds 9.98854 xmit 172166 recv 5344 timeout 172157 usec 251
After: Seconds 5.72803 xmit 244322 recv 9919 timeout 244302 usec 156
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit 9254926f85466979ef5f0e16386c294bf0973a90
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Tue Jul 29 09:58:36 2008 -0500
lguest: Remove 'network: no dma buffer!' warning
This warning can happen a lot under load, and it should be warnx not
warn anwyay.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit aa1249840bfc8d62431eed5796bf99887b963ab6
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Tue Jul 29 09:58:36 2008 -0500
lguest: Adaptive timeout
Since the correct timeout value varies, use a heuristic which adjusts
the timeout depending on how many packets we've seen. This gives
slightly worse results, but doesn't need tweaking when GSO is
introduced.
500 usec 19.1887 xmit 561141 recv 1 timeout 559657
Dynamic (278) 20.1974 xmit 214510 recv 5 timeout 214491 usec 278
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit a161883a29bf6100efe7b5346bec274e5023c29c
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Tue Jul 29 09:58:35 2008 -0500
lguest: Tell Guest net not to notify us on every packet xmit
virtio_ring has the ability to suppress notifications. This prevents
a guest exit for every packet, but we need to set a timer on packet
receipt to re-check if there were any remaining packets.
Here are the times for 1G TCP Guest->Host with different timeout
settings (it matters because the TCP window doesn't grow big enough to
fill the entire buffer):
Timeout value Seconds Xmit/Recv/Timeout
None (before) 25.3784 xmit 7750233 recv 1
2500 usec 62.5119 xmit 207020 recv 2 timeout 207020
1000 usec 34.5379 xmit 207003 recv 2 timeout 207003
750 usec 29.2305 xmit 207002 recv 1 timeout 207002
500 usec 19.1887 xmit 561141 recv 1 timeout 559657
250 usec 20.0465 xmit 214128 recv 2 timeout 214110
100 usec 19.2583 xmit 561621 recv 1 timeout 560153
(Note that these values are sensitive to the GSO patches which come
later, and probably other traffic-related variables, so take with a
large grain of salt).
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit 5dae785a82c1a8c05b5b4f9709bd9ce658dcf1b6
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Tue Jul 29 09:58:35 2008 -0500
lguest: net block unneeded receive queue update notifications
Number of exits transmitting 10GB Guest->Host before:
network xmit 7858610 recv 118136
After:
network xmit 7750233 recv 1
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit b5111790fa6695b1502d4f5d389f6b22b9de10c3
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Tue Jul 29 09:58:34 2008 -0500
lguest: wrap last_avail accesses.
To simplify the transition to when we publish indices in the ring
(and make shuffling my patch queue easier), wrap them in a lg_last_avail()
macro.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit cf485e566bc4a8098680162e1cc2ac1dfbef8a3c
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Mon Jun 9 16:22:48 2008 -0700
lguest: use cpu capability accessors
To support my little make-x86-bitops-use-proper-typechecking projectlet.
Cc: Thomas Gleixner <tglx at linutronix.de>
Cc: Andrea Arcangeli <andrea at qumranet.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Acked-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit 28fd6d7f953711fbf67496701be05513052d967d
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Tue Jul 29 09:58:33 2008 -0500
lguest: virtio-rng support
This is a simple patch to add support for the virtio "hardware random
generator" to lguest. It gets about 1.2 MB/sec reading from /dev/hwrng
in the guest.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit dec6a2be085f046d42eb0bdce95ecb73de526429
Author: Mark McLoughlin <markmc at redhat.com>
Date: Tue Jul 29 09:58:33 2008 -0500
lguest: Support assigning a MAC address
If you've got a nice DHCP configuration which maps MAC
addresses to specific IP addresses, then you're going to
want to start your guest with one of those MAC addresses.
Also, in Fedora, we have persistent network interface naming
based on the MAC address, so with randomly assigned
addresses you're soon going to hit eth13. Who knows what
will happen then!
Allow assigning a MAC address to the network interface with
e.g.
--tunnet=bridge:eth0:00:FF:95:6B:DA:3D
or:
--tunnet=192.168.121.1:00:FF:95:6B:DA:3D
which is pretty unintelligable, but ...
(includes Rusty's minor rework)
Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit 34bdaab44dd5dac861b0d23bc29b147b569e5783
Author: Mark McLoughlin <markmc at redhat.com>
Date: Fri Jun 13 14:04:58 2008 +0100
lguest: Don't leak /dev/zero fd
Signed-off-by: Mark McLoughlin <markmc at redhat.com>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit 32c68e5c569fdf016b494ce2fc8eecf59b6881bd
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Tue Jul 29 09:58:32 2008 -0500
lguest: fix verbose printing of device features.
%02x is more appropriate for bytes than %08x.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit 0a707210aa1b8ac40fe781b2a9d0b203b6ebb921
Author: Johannes Weiner <hannes at saeurebad.de>
Date: Tue Jul 8 10:29:42 2008 +0200
lguest: fix switcher_page leak on unload
map_switcher allocates the array, unmap_switcher has to free it
accordingly.
Signed-off-by: Johannes Weiner <hannes at saeurebad.de>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit 0c12091d82e48dc423fb1f51eb0062c557a084af
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Tue Jul 29 09:58:31 2008 -0500
lguest: Guest int3 fix
Ron Minnich noticed that guest userspace gets a GPF when it tries to int3:
we need to copy the privilege level from the guest-supplied IDT to the real
IDT. int3 is the only common case where guest userspace expects to invoke
an interrupt, so that's the symptom of failing to do this.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
commit 5d006d8d09e82f086ca0baf79a2907f2c1e25af7
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Tue Jul 29 09:58:29 2008 -0500
lguest: set max_pfn_mapped, growl loudly at Yinghai Lu
6af61a7614a306fe882a0c2b4ddc63b65aa66efc 'x86: clean up max_pfn_mapped
usage - 32-bit' makes the following comment:
XEN PV and lguest may need to assign max_pfn_mapped too.
But no CC. Yinghai, wasting fellow developers' time is a VERY bad
habit. If you do it again, I will hunt you down and try to extract
the three hours of my life I just lost :)
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
Cc: Yinghai Lu <yhlu.kernel at gmail.com>
commit 424f525a1241351da947fb48a938128ddd774511
Author: Dmitry Baryshkov <dbaryshkov at gmail.com>
Date: Tue Jul 29 01:30:26 2008 +0200
mfd: accept pure device as a parent, not only platform_device
Signed-off-by: Dmitry Baryshkov <dbaryshkov at gmail.com>
Signed-off-by: Samuel Ortiz <sameo at openedhand.com>
commit 34ee55014283a60efa3534c06e010579ffdd3756
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Mon Jul 28 15:46:40 2008 -0700
include/asm-generic/pgtable-nopmd.h: macros are noxious, reason #435
arch/x86/mm/pgtable.c: In function 'pgd_mop_up_pmds':
arch/x86/mm/pgtable.c:194: warning: unused variable 'pmd'
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c27ef92d8e0c29a9e8b8ee1b04f3d2cace482d92
Author: Manuel Lauss <mano at roarinelk.homelinux.net>
Date: Mon Jul 28 15:46:39 2008 -0700
sh7760fb: write colormap value to hardware
The computed color value is never actually written to hardware
colormap register.
Signed-off-by: Manuel Lauss <mano at roarinelk.homelinux.net>
Cc: Nobuhiro Iwamatsu <iwamatsu.nobuhiro at renesas.com>
Cc: Munakata Hisao <munakata.hisao at renesas.com>
Cc: Paul Mundt <lethal at linux-sh.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7fcba054373d5dfc43d26e243a5c9b92069972ee
Author: Eric Sandeen <sandeen at redhat.com>
Date: Mon Jul 28 15:46:39 2008 -0700
eCryptfs: use page_alloc not kmalloc to get a page of memory
With SLUB debugging turned on in 2.6.26, I was getting memory corruption
when testing eCryptfs. The root cause turned out to be that eCryptfs was
doing kmalloc(PAGE_CACHE_SIZE); virt_to_page() and treating that as a nice
page-aligned chunk of memory. But at least with SLUB debugging on, this
is not always true, and the page we get from virt_to_page does not
necessarily match the PAGE_CACHE_SIZE worth of memory we got from kmalloc.
My simple testcase was 2 loops doing "rm -f fileX; cp /tmp/fileX ." for 2
different multi-megabyte files. With this change I no longer see the
corruption.
Signed-off-by: Eric Sandeen <sandeen at redhat.com>
Acked-by: Michael Halcrow <mhalcrow at us.ibm.com>
Acked-by: Rik van Riel <riel at redhat.com>
Cc: <stable at kernel.org> [2.6.25.x, 2.6.26.x]
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 25947d5ac56004378d8c2d31ebf22600d5bc0c02
Author: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Date: Mon Jul 28 15:46:38 2008 -0700
gpio: fix build on CONFIG_GPIO_SYSFS=n
If CONFIG_GENERIC_GPIO=y && CONFIG_GPIO_SYSFS=n, gpio_export() in
asm-generic/gpio.h refers -ENOSYS and causes build error.
Signed-off-by: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
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 e3b6e806cf7e45ac5e6ac0625cebafa4de3394aa
Author: Yoichi Yuasa <yoichi_yuasa at tripeaks.co.jp>
Date: Mon Jul 28 15:46:37 2008 -0700
bio-integrity: remove EXPORT_SYMBOL for bio_integrity_init_slab()
I got section mismatch message about bio_integrity_init_slab().
WARNING: fs/built-in.o(__ksymtab+0xb60): Section mismatch in reference from the variable __ksymtab_bio_integrity_init_slab to the function .init.text:bio_integrity_init_slab()
The symbol bio_integrity_init_slab is exported and annotated __init Fix
this by removing the __init annotation of bio_integrity_init_slab or drop
the export.
It only call from init_bio(). The EXPORT_SYMBOL() can be removed.
Signed-off-by: Yoichi Yuasa <yoichi_yuasa at tripeaks.co.jp>
Cc: "Martin K. Petersen" <martin.petersen at oracle.com>
Cc: Jens Axboe <jens.axboe at oracle.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8ab22b9abb5c55413802e4adc9aa6223324547c3
Author: Hisashi Hifumi <hifumi.hisashi at oss.ntt.co.jp>
Date: Mon Jul 28 15:46:36 2008 -0700
vfs: pagecache usage optimization for pagesize!=blocksize
When we read some part of a file through pagecache, if there is a
pagecache of corresponding index but this page is not uptodate, read IO
is issued and this page will be uptodate.
I think this is good for pagesize == blocksize environment but there is
room for improvement on pagesize != blocksize environment. Because in
this case a page can have multiple buffers and even if a page is not
uptodate, some buffers can be uptodate.
So I suggest that when all buffers which correspond to a part of a file
that we want to read are uptodate, use this pagecache and copy data from
this pagecache to user buffer even if a page is not uptodate. This can
reduce read IO and improve system throughput.
I wrote a benchmark program and got result number with this program.
This benchmark do:
1: mount and open a test file.
2: create a 512MB file.
3: close a file and umount.
4: mount and again open a test file.
5: pwrite randomly 300000 times on a test file. offset is aligned
by IO size(1024bytes).
6: measure time of preading randomly 100000 times on a test file.
The result was:
2.6.26
330 sec
2.6.26-patched
226 sec
Arch:i386
Filesystem:ext3
Blocksize:1024 bytes
Memory: 1GB
On ext3/4, a file is written through buffer/block. So random read/write
mixed workloads or random read after random write workloads are optimized
with this patch under pagesize != blocksize environment. This test result
showed this.
The benchmark program is as follows:
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <time.h>
#include <stdlib.h>
#include <string.h>
#include <sys/mount.h>
#define LEN 1024
#define LOOP 1024*512 /* 512MB */
main(void)
{
unsigned long i, offset, filesize;
int fd;
char buf[LEN];
time_t t1, t2;
if (mount("/dev/sda1", "/root/test1/", "ext3", 0, 0) < 0) {
perror("cannot mount\n");
exit(1);
}
memset(buf, 0, LEN);
fd = open("/root/test1/testfile", O_CREAT|O_RDWR|O_TRUNC);
if (fd < 0) {
perror("cannot open file\n");
exit(1);
}
for (i = 0; i < LOOP; i++)
write(fd, buf, LEN);
close(fd);
if (umount("/root/test1/") < 0) {
perror("cannot umount\n");
exit(1);
}
if (mount("/dev/sda1", "/root/test1/", "ext3", 0, 0) < 0) {
perror("cannot mount\n");
exit(1);
}
fd = open("/root/test1/testfile", O_RDWR);
if (fd < 0) {
perror("cannot open file\n");
exit(1);
}
filesize = LEN * LOOP;
for (i = 0; i < 300000; i++){
offset = (random() % filesize) & (~(LEN - 1));
pwrite(fd, buf, LEN, offset);
}
printf("start test\n");
time(&t1);
for (i = 0; i < 100000; i++){
offset = (random() % filesize) & (~(LEN - 1));
pread(fd, buf, LEN, offset);
}
time(&t2);
printf("%ld sec\n", t2-t1);
close(fd);
if (umount("/root/test1/") < 0) {
perror("cannot umount\n");
exit(1);
}
}
Signed-off-by: Hisashi Hifumi <hifumi.hisashi at oss.ntt.co.jp>
Cc: Nick Piggin <nickpiggin at yahoo.com.au>
Cc: Christoph Hellwig <hch at infradead.org>
Cc: Jan Kara <jack at ucw.cz>
Cc: <linux-ext4 at vger.kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d84a52f62f6a396ed77aa0052da74ca9e760b28a
Author: Simon Horman <horms at verge.net.au>
Date: Mon Jul 28 15:46:34 2008 -0700
kdump: update kdump documentation as kexec-tools-resting has been renamed kexec-tools
Signed-off-by: Simon Horman <horms at verge.net.au>
Acked-by: Vivek Goyal <vgoyal at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cb1d0a7a5d2e537f2f6ada22883abee1762e94b2
Author: Ben Dooks <ben-linux at fluff.org>
Date: Mon Jul 28 15:46:33 2008 -0700
spi_s3c24xx: really assign busnum
The original "Pass the bus number we expect the S3C24XX SPI driver to
attach to via the platform data." [1] patch was mis-sent, and missed two
important parts of the diff, which was to actually set the bus_num field
and add the relevant field to the platform data.
The previous commit 50f426b55d919dd017af35bb6a08753d1f262920 promised to
add a bus_num field, but failed to include the two hunks that added this
field to include/asm-arm/arch-s3c2410/spi.h and then pass it to the spi
core when creating the new master field in drivers/spi/spi_s3c24xx.c.
[1] git commit 50f426b55d919dd017af35bb6a08753d1f262920
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
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 9a7867e1b34c3575e7e76a05c0c54c6edbdae2a4
Author: Luotao Fu <l.fu at pengutronix.de>
Date: Mon Jul 28 15:46:32 2008 -0700
mpc52xx_psc_spi: fix block transfer
The block transfer routine in the mpc52xx psc spi driver misinterpret
the datasheet. According to the processor datasheet the chipselect is
held as long as the EOF is not written.
Theoretically blocks of any sizes can be transferred in this way. The
old routine however writes an EOF after every word, which has the size
of size_of_word. This makes the transfer slow.
Also fixed some duplicate code.
Signed-off-by: Luotao Fu <l.fu at pengutronix.de>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Cc: <stable at kernel.org> [2.6.25.x, 2.6.26.x]
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 78a34ae29bf1c9df62a5bd0f0798b6c62a54d520
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Jul 28 15:46:30 2008 -0700
mm/hugetlb.c must #include <asm/io.h>
This patch fixes the following build error on sh caused by commit
aa888a74977a8f2120ae9332376e179c39a6b07d ("hugetlb: support larger than
MAX_ORDER"):
mm/hugetlb.c: In function 'alloc_bootmem_huge_page':
mm/hugetlb.c:958: error: implicit declaration of function 'virt_to_phys'
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Cc: Hirokazu Takata <takata at linux-m32r.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit cddb8a5c14aa89810b40495d94d3d2a0faee6619
Author: Andrea Arcangeli <andrea at qumranet.com>
Date: Mon Jul 28 15:46:29 2008 -0700
mmu-notifiers: core
With KVM/GFP/XPMEM there isn't just the primary CPU MMU pointing to pages.
There are secondary MMUs (with secondary sptes and secondary tlbs) too.
sptes in the kvm case are shadow pagetables, but when I say spte in
mmu-notifier context, I mean "secondary pte". In GRU case there's no
actual secondary pte and there's only a secondary tlb because the GRU
secondary MMU has no knowledge about sptes and every secondary tlb miss
event in the MMU always generates a page fault that has to be resolved by
the CPU (this is not the case of KVM where the a secondary tlb miss will
walk sptes in hardware and it will refill the secondary tlb transparently
to software if the corresponding spte is present). The same way
zap_page_range has to invalidate the pte before freeing the page, the spte
(and secondary tlb) must also be invalidated before any page is freed and
reused.
Currently we take a page_count pin on every page mapped by sptes, but that
means the pages can't be swapped whenever they're mapped by any spte
because they're part of the guest working set. Furthermore a spte unmap
event can immediately lead to a page to be freed when the pin is released
(so requiring the same complex and relatively slow tlb_gather smp safe
logic we have in zap_page_range and that can be avoided completely if the
spte unmap event doesn't require an unpin of the page previously mapped in
the secondary MMU).
The mmu notifiers allow kvm/GRU/XPMEM to attach to the tsk->mm and know
when the VM is swapping or freeing or doing anything on the primary MMU so
that the secondary MMU code can drop sptes before the pages are freed,
avoiding all page pinning and allowing 100% reliable swapping of guest
physical address space. Furthermore it avoids the code that teardown the
mappings of the secondary MMU, to implement a logic like tlb_gather in
zap_page_range that would require many IPI to flush other cpu tlbs, for
each fixed number of spte unmapped.
To make an example: if what happens on the primary MMU is a protection
downgrade (from writeable to wrprotect) the secondary MMU mappings will be
invalidated, and the next secondary-mmu-page-fault will call
get_user_pages and trigger a do_wp_page through get_user_pages if it
called get_user_pages with write=1, and it'll re-establishing an updated
spte or secondary-tlb-mapping on the copied page. Or it will setup a
readonly spte or readonly tlb mapping if it's a guest-read, if it calls
get_user_pages with write=0. This is just an example.
This allows to map any page pointed by any pte (and in turn visible in the
primary CPU MMU), into a secondary MMU (be it a pure tlb like GRU, or an
full MMU with both sptes and secondary-tlb like the shadow-pagetable layer
with kvm), or a remote DMA in software like XPMEM (hence needing of
schedule in XPMEM code to send the invalidate to the remote node, while no
need to schedule in kvm/gru as it's an immediate event like invalidating
primary-mmu pte).
At least for KVM without this patch it's impossible to swap guests
reliably. And having this feature and removing the page pin allows
several other optimizations that simplify life considerably.
Dependencies:
1) mm_take_all_locks() to register the mmu notifier when the whole VM
isn't doing anything with "mm". This allows mmu notifier users to keep
track if the VM is in the middle of the invalidate_range_begin/end
critical section with an atomic counter incraese in range_begin and
decreased in range_end. No secondary MMU page fault is allowed to map
any spte or secondary tlb reference, while the VM is in the middle of
range_begin/end as any page returned by get_user_pages in that critical
section could later immediately be freed without any further
->invalidate_page notification (invalidate_range_begin/end works on
ranges and ->invalidate_page isn't called immediately before freeing
the page). To stop all page freeing and pagetable overwrites the
mmap_sem must be taken in write mode and all other anon_vma/i_mmap
locks must be taken too.
2) It'd be a waste to add branches in the VM if nobody could possibly
run KVM/GRU/XPMEM on the kernel, so mmu notifiers will only enabled if
CONFIG_KVM=m/y. In the current kernel kvm won't yet take advantage of
mmu notifiers, but this already allows to compile a KVM external module
against a kernel with mmu notifiers enabled and from the next pull from
kvm.git we'll start using them. And GRU/XPMEM will also be able to
continue the development by enabling KVM=m in their config, until they
submit all GRU/XPMEM GPLv2 code to the mainline kernel. Then they can
also enable MMU_NOTIFIERS in the same way KVM does it (even if KVM=n).
This guarantees nobody selects MMU_NOTIFIER=y if KVM and GRU and XPMEM
are all =n.
The mmu_notifier_register call can fail because mm_take_all_locks may be
interrupted by a signal and return -EINTR. Because mmu_notifier_reigster
is used when a driver startup, a failure can be gracefully handled. Here
an example of the change applied to kvm to register the mmu notifiers.
Usually when a driver startups other allocations are required anyway and
-ENOMEM failure paths exists already.
struct kvm *kvm_arch_create_vm(void)
{
struct kvm *kvm = kzalloc(sizeof(struct kvm), GFP_KERNEL);
+ int err;
if (!kvm)
return ERR_PTR(-ENOMEM);
INIT_LIST_HEAD(&kvm->arch.active_mmu_pages);
+ kvm->arch.mmu_notifier.ops = &kvm_mmu_notifier_ops;
+ err = mmu_notifier_register(&kvm->arch.mmu_notifier, current->mm);
+ if (err) {
+ kfree(kvm);
+ return ERR_PTR(err);
+ }
+
return kvm;
}
mmu_notifier_unregister returns void and it's reliable.
The patch also adds a few needed but missing includes that would prevent
kernel to compile after these changes on non-x86 archs (x86 didn't need
them by luck).
[akpm at linux-foundation.org: coding-style fixes]
[akpm at linux-foundation.org: fix mm/filemap_xip.c build]
[akpm at linux-foundation.org: fix mm/mmu_notifier.c build]
Signed-off-by: Andrea Arcangeli <andrea at qumranet.com>
Signed-off-by: Nick Piggin <npiggin at suse.de>
Signed-off-by: Christoph Lameter <cl at linux-foundation.org>
Cc: Jack Steiner <steiner at sgi.com>
Cc: Robin Holt <holt at sgi.com>
Cc: Nick Piggin <npiggin at suse.de>
Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: Kanoj Sarcar <kanojsarcar at yahoo.com>
Cc: Roland Dreier <rdreier at cisco.com>
Cc: Steve Wise <swise at opengridcomputing.com>
Cc: Avi Kivity <avi at qumranet.com>
Cc: Hugh Dickins <hugh at veritas.com>
Cc: Rusty Russell <rusty at rustcorp.com.au>
Cc: Anthony Liguori <aliguori at us.ibm.com>
Cc: Chris Wright <chrisw at redhat.com>
Cc: Marcelo Tosatti <marcelo at kvack.org>
Cc: Eric Dumazet <dada1 at cosmosbay.com>
Cc: "Paul E. McKenney" <paulmck at us.ibm.com>
Cc: Izik Eidus <izike at qumranet.com>
Cc: Anthony Liguori <aliguori at us.ibm.com>
Cc: Rik van Riel <riel at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7906d00cd1f687268f0a3599442d113767795ae6
Author: Andrea Arcangeli <andrea at qumranet.com>
Date: Mon Jul 28 15:46:26 2008 -0700
mmu-notifiers: add mm_take_all_locks() operation
mm_take_all_locks holds off reclaim from an entire mm_struct. This allows
mmu notifiers to register into the mm at any time with the guarantee that
no mmu operation is in progress on the mm.
This operation locks against the VM for all pte/vma/mm related operations
that could ever happen on a certain mm. This includes vmtruncate,
try_to_unmap, and all page faults.
The caller must take the mmap_sem in write mode before calling
mm_take_all_locks(). The caller isn't allowed to release the mmap_sem
until mm_drop_all_locks() returns.
mmap_sem in write mode is required in order to block all operations that
could modify pagetables and free pages without need of altering the vma
layout (for example populate_range() with nonlinear vmas). It's also
needed in write mode to avoid new anon_vmas to be associated with existing
vmas.
A single task can't take more than one mm_take_all_locks() in a row or it
would deadlock.
mm_take_all_locks() and mm_drop_all_locks are expensive operations that
may have to take thousand of locks.
mm_take_all_locks() can fail if it's interrupted by signals.
When mmu_notifier_register returns, we must be sure that the driver is
notified if some task is in the middle of a vmtruncate for the 'mm' where
the mmu notifier was registered (mmu_notifier_invalidate_range_start/end
is run around the vmtruncation but mmu_notifier_register can run after
mmu_notifier_invalidate_range_start and before
mmu_notifier_invalidate_range_end). Same problem for rmap paths. And
we've to remove page pinning to avoid replicating the tlb_gather logic
inside KVM (and GRU doesn't work well with page pinning regardless of
needing tlb_gather), so without mm_take_all_locks when vmtruncate frees
the page, kvm would have no way to notice that it mapped into sptes a page
that is going into the freelist without a chance of any further
mmu_notifier notification.
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Andrea Arcangeli <andrea at qumranet.com>
Acked-by: Linus Torvalds <torvalds at linux-foundation.org>
Cc: Christoph Lameter <cl at linux-foundation.org>
Cc: Jack Steiner <steiner at sgi.com>
Cc: Robin Holt <holt at sgi.com>
Cc: Nick Piggin <npiggin at suse.de>
Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: Kanoj Sarcar <kanojsarcar at yahoo.com>
Cc: Roland Dreier <rdreier at cisco.com>
Cc: Steve Wise <swise at opengridcomputing.com>
Cc: Avi Kivity <avi at qumranet.com>
Cc: Hugh Dickins <hugh at veritas.com>
Cc: Rusty Russell <rusty at rustcorp.com.au>
Cc: Anthony Liguori <aliguori at us.ibm.com>
Cc: Chris Wright <chrisw at redhat.com>
Cc: Marcelo Tosatti <marcelo at kvack.org>
Cc: Eric Dumazet <dada1 at cosmosbay.com>
Cc: "Paul E. McKenney" <paulmck at us.ibm.com>
Cc: Izik Eidus <izike at qumranet.com>
Cc: Anthony Liguori <aliguori at us.ibm.com>
Cc: Rik van Riel <riel at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6beeac76f5f96590fb751af5e138fbc3f62e8460
Author: Andrea Arcangeli <andrea at qumranet.com>
Date: Mon Jul 28 15:46:22 2008 -0700
mmu-notifiers: add list_del_init_rcu()
Introduce list_del_init_rcu() and document it.
Signed-off-by: Andrea Arcangeli <andrea at qumranet.com>
Acked-by: Linus Torvalds <torvalds at linux-foundation.org>
Cc: "Paul E. McKenney" <paulmck at us.ibm.com>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Christoph Lameter <cl at linux-foundation.org>
Cc: Jack Steiner <steiner at sgi.com>
Cc: Robin Holt <holt at sgi.com>
Cc: Nick Piggin <npiggin at suse.de>
Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: Kanoj Sarcar <kanojsarcar at yahoo.com>
Cc: Roland Dreier <rdreier at cisco.com>
Cc: Steve Wise <swise at opengridcomputing.com>
Cc: Avi Kivity <avi at qumranet.com>
Cc: Hugh Dickins <hugh at veritas.com>
Cc: Rusty Russell <rusty at rustcorp.com.au>
Cc: Anthony Liguori <aliguori at us.ibm.com>
Cc: Chris Wright <chrisw at redhat.com>
Cc: Marcelo Tosatti <marcelo at kvack.org>
Cc: Eric Dumazet <dada1 at cosmosbay.com>
Cc: "Paul E. McKenney" <paulmck at us.ibm.com>
Cc: Izik Eidus <izike at qumranet.com>
Cc: Anthony Liguori <aliguori at us.ibm.com>
Cc: Rik van Riel <riel at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 93686ae8357c1b1e37e8dfc96547f807e7a93b4b
Author: David Brownell <dbrownell at users.sourceforge.net>
Date: Mon Jul 28 15:46:22 2008 -0700
arm: fix HAVE_CLK merge goof
This fixes a merge goof whereby ARCH_EP93XX got the "select HAVE_CLK" line
which belongs instead with ARCH_AT91.
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 4d9c377c81d37740b25cacf025f95c084eafabbb
Author: Alexey Dobriyan <adobriyan at gmail.com>
Date: Mon Jul 28 15:46:21 2008 -0700
__ratelimit() cpu flags can't be static
Signed-off-by: Alexey Dobriyan <adobriyan at gmail.com>
Cc: Dave Young <hidave.darkstar at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 14fcc23fdc78e9d32372553ccf21758a9bd56fa1
Author: Hugh Dickins <hugh at veritas.com>
Date: Mon Jul 28 15:46:19 2008 -0700
tmpfs: fix kernel BUG in shmem_delete_inode
SuSE's insserve initscript ordering program hits kernel BUG at mm/shmem.c:814
on 2.6.26. It's using posix_fadvise on directories, and the shmem_readpage
method added in 2.6.23 is letting POSIX_FADV_WILLNEED allocate useless pages
to a tmpfs directory, incrementing i_blocks count but never decrementing it.
Fix this by assigning shmem_aops (pointing to readpage and writepage and
set_page_dirty) only when it's needed, on a regular file or a long symlink.
Many thanks to Kel for outstanding bugreport and steps to reproduce it.
Reported-by: Kel Modderman <kel at otaku42.de>
Tested-by: Kel Modderman <kel at otaku42.de>
Signed-off-by: Hugh Dickins <hugh at veritas.com>
Cc: <stable at kernel.org> [2.6.25.x, 2.6.26.x]
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ca5b172bd2b2fe489e7ba11cedd46ddf772d132f
Author: Hugh Dickins <hugh at veritas.com>
Date: Mon Jul 28 15:46:18 2008 -0700
exec: include pagemap.h again to fix build
Fix compilation errors on avr32 and without CONFIG_SWAP, introduced by
ba92a43dbaee339cf5915ef766d3d3ffbaaf103c ("exec: remove some includes")
In file included from include/asm/tlb.h:24,
from fs/exec.c:55:
include/asm-generic/tlb.h: In function 'tlb_flush_mmu':
include/asm-generic/tlb.h:76: error: implicit declaration of function 'release_pages'
include/asm-generic/tlb.h: In function 'tlb_remove_page':
include/asm-generic/tlb.h:105: error: implicit declaration of function 'page_cache_release'
make[1]: *** [fs/exec.o] Error 1
This straightforward part-revert is nobody's favourite patch to address
the underlying tlb.h needs swap.h needs pagemap.h (but sparc won't like
that) mess; but appropriate to fix the build now before any overhaul.
Reported-by: Yoichi Yuasa <yoichi_yuasa at tripeaks.co.jp>
Reported-by: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
Signed-off-by: Hugh Dickins <hugh at veritas.com>
Tested-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b9edb17cc268bc4c6f344264fb9af73f646a02c1
Author: Paul Mundt <lethal at linux-sh.org>
Date: Tue Jul 29 08:29:32 2008 +0900
sh: Add an arch/sh/kernel/.gitignore
Ignore vmlinux.lds.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit cc64f7f70033d6cf18f716c885a7df858ad51766
Author: Paul Mundt <lethal at linux-sh.org>
Date: Tue Jul 29 08:24:50 2008 +0900
sh: dreamcast: fix build failure from header reorg.
Oops, machvec.h is in asm/, it was previously removed due to overzealous
trimming. Fix up the path again.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 56edb58be157a06dc147a988af3588059556d392
Author: Mike Rapoport <mike at compulab.co.il>
Date: Tue Jul 29 01:23:32 2008 +0200
mfd: add platform_data to mfd_cell
Adding platform_data to mfd_cell allows passing of platform data directly
to the platform_device created for each cell and thus reuse of existing
drivers.
On the other side it can be used as a hook to mfd_cell itself
removing the need in mfd_get_cell method.
Signed-off-by: Mike Rapoport <mike at compulab.co.il>
Acked-by: Dmitry Baryshkov <dbaryshkov at gmail.com>
Signed-off-by: Samuel Ortiz <sameo at openedhand.com>
commit f15cbe6f1a4b4d9df59142fc8e4abb973302cf44
Author: Paul Mundt <lethal at linux-sh.org>
Date: Tue Jul 29 08:09:44 2008 +0900
sh: migrate to arch/sh/include/
This follows the sparc changes a439fe51a1f8eb087c22dd24d69cebae4a3addac.
Most of the moving about was done with Sam's directions at:
http://marc.info/?l=linux-sh&m=121724823706062&w=2
with subsequent hacking and fixups entirely my fault.
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 12c0b20fa4afb5c8a377d6987fb2dcf353e1dce1
Author: Bjorn Helgaas <bjorn.helgaas at hp.com>
Date: Wed Jul 23 17:00:13 2008 -0600
x86/PCI: use dev_printk when possible
Convert printks to use dev_printk().
I converted DBG() to dev_dbg(). This DBG() is from arch/x86/pci/pci.h and
requires source-code modification to enable, so dev_dbg() seems roughly
equivalent.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas at hp.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit 756f7bc6683916177e8176f8d3fa5f4c11c88afc
Merge: 979b1791e5b8f8b556faeec4c48339e7ed63af9f cb28a1bbdb4790378e7366d6c9ee1d2340b84f92
Author: Jesse Barnes <jbarnes at hobbes.lan>
Date: Mon Jul 28 15:15:46 2008 -0700
Merge branch 'core/generic-dma-coherent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into for-linus
commit 63add2f2072e69c1eb7a5f6ca8f415122da889b9
Merge: 3684a601e4273692b6c80b86e55c728aef675660 9e3ee1c39c0cc71222f9980ccbf87fe072897eef
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jul 28 15:13:42 2008 -0700
Merge branch 'cpus4096-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'cpus4096-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
cpu masks: optimize and clean up cpumask_of_cpu()
cpumask: export cpumask_of_cpu_map
cpumask: change cpumask_of_cpu_ptr to use new cpumask_of_cpu
cpumask: put cpumask_of_cpu_map in the initdata section
cpumask: make cpumask_of_cpu_map generic
commit 3684a601e4273692b6c80b86e55c728aef675660
Author: James Bottomley <James.Bottomley at HansenPartnership.com>
Date: Mon Jul 28 17:11:44 2008 -0500
ipwireless: fix compile failure
There's a brown paper bag compile failure introduced by this patch
commit a01386924874c4d6d67f8a34e66f04452c2abb69
Author: David Sterba <dsterba at suse.cz>
Date: Mon Jul 28 16:53:32 2008 +0200
ipwireless: Preallocate received packet buffers with MRU size
Really, it can't ever have been even compile tested. It looks like the
closing bracket is in the wrong place, so this is the fix.
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 979b1791e5b8f8b556faeec4c48339e7ed63af9f
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Thu Jul 24 17:18:38 2008 +0100
PCI: add D3 power state avoidance quirk
Libata has some hacks to deal with certain controllers going silly in D3
state. The right way to handle this is to keep a PCI device flag for
such devices. That can then be generalised for no ATA devices with power
problems.
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit cb28a1bbdb4790378e7366d6c9ee1d2340b84f92
Merge: b6d4f7e3ef25beb8c658c97867d98883e69dc544 f934fb19ef34730263e6afc01e8ec27a8a71470f
Author: Ingo Molnar <mingo at elte.hu>
Date: Tue Jul 29 00:07:55 2008 +0200
Merge branch 'linus' into core/generic-dma-coherent
Conflicts:
arch/x86/Kconfig
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 362b7077a5546b42131af15ba4776f30c9a72d0c
Author: Matthew Wilcox <matthew at wil.cx>
Date: Tue Jul 22 12:37:17 2008 -0600
PCI: fix bogus "'device' may be used uninitialized" warning in pci_slot
I get warnings about 'device' possibly being used uninitialised. While
I can deduce this is not true, it seems that GCC can't. This patch
changes `check_slot' to return device on success and -1 on error, which
shuts GCC up.
Acked-by: Alex Chiang <achiang at hp.com>
Signed-off-by: Matthew Wilcox <willy at linux.intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit d6d385743463f38a0da899cd4607e526ad9a049f
Author: Shaohua Li <shaohua.li at intel.com>
Date: Wed Jul 23 10:32:42 2008 +0800
PCI: add an option to allow ASPM enabled forcibly
A new option, pcie_aspm=force, will force ASPM to be enabled, even on system
with PCIe 1.0 devices.
Signed-off-by: Shaohua Li <shaohua.li at intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit 149e16372a2066c5474d8a8db9b252afd57eb427
Author: Shaohua Li <shaohua.li at intel.com>
Date: Wed Jul 23 10:32:31 2008 +0800
PCI: disable ASPM on pre-1.1 PCIe devices
Disable ASPM on pre-1.1 PCIe devices, as many of them don't implement it
correctly.
Tested-by: Jack Howarth <howarth at bromo.msbb.uc.edu>
Signed-off-by: Shaohua Li <shaohua.li at intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit 5fde244d39b88625ac578d83e6625138714de031
Author: Shaohua Li <shaohua.li at intel.com>
Date: Wed Jul 23 10:32:24 2008 +0800
PCI: disable ASPM per ACPI FADT setting
The ACPI FADT table includes an ASPM control bit. If the bit is set, do
not enable ASPM since it may indicate that the platform doesn't actually
support the feature.
Tested-by: Jack Howarth <howarth at bromo.msbb.uc.edu>
Signed-off-by: Shaohua Li <shaohua.li at intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit ce6fce4295ba727b36fdc73040e444bd1aae64cd
Author: Matthew Wilcox <matthew at wil.cx>
Date: Fri Jul 25 15:42:58 2008 -0600
PCI MSI: Don't disable MSIs if the mask bit isn't supported
David Vrabel has a device which generates an interrupt storm on the INTx
pin if we disable MSI interrupts altogether. Masking interrupts is only
a performance optimisation, so we can ignore the request to mask the
interrupt.
Signed-off-by: Matthew Wilcox <willy at linux.intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit 25326277d8d1393d1c66240e6255aca780f9e3eb
Author: Paul Mundt <lethal at linux-sh.org>
Date: Tue Jul 29 06:39:26 2008 +0900
video: Kill off leaked CONFIG_FB_SH7343VOU reference.
This came in with the SH-Mobile LCDC changes in commit
cfb4f5d1750e05f43902197713c50c29e7dfbc99, kill it off.
Reported-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 5c806b208b390969a6051543e96bb4eae40554ac
Author: Paul Mundt <lethal at linux-sh.org>
Date: Tue Jul 29 06:34:01 2008 +0900
MAINTAINERS: Switch SUPERH to Supported.
Apparently the SH entry ought to be Supported instead of Maintained,
given the suble difference in terminology. Though it's been this way
for years now, thanks to Renesas.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 103340cc36384c1afee4453b65a784d8b20d9d8d
Author: Paul Mundt <lethal at linux-sh.org>
Date: Mon Jul 28 22:32:03 2008 +0900
sh: Fix up unaligned current_text_addr().
As noted by Adrian:
Commit 3ab83521378268044a448113c6aa9a9e245f4d2f (kexec jump)
causes the following build error on sh:
<-- snip -->
...
CC kernel/kexec.o
{standard input}: Assembler messages:
{standard input}:1518: Error: offset to unaligned destination
make[2]: *** [kernel/kexec.o] Error 1
<-- snip -->
If I understand the assembler correctly it fails at
include/asm-sh/kexec.h:59
The issue here is that the mova reference lacks an explicit alignment,
and previous code paths would end up with this on a 16-bit boundary,
so we make the alignment explicit.
Reported-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 11325f035edba6ba4bc005d2cdebea19d7d8f388
Author: Paul Mundt <lethal at linux-sh.org>
Date: Mon Jul 28 22:31:43 2008 +0900
sh: rsk7203: update defconfig.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 6d0b365731682857ecc754163e7c5cb9edaae846
Author: Paul Mundt <lethal at linux-sh.org>
Date: Mon Jul 28 22:31:02 2008 +0900
sh: rsk7203: Add smc911x platform data.
This hooks up platform data for the SMC9118 on the RSK+7203.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 9e3ee1c39c0cc71222f9980ccbf87fe072897eef
Merge: e56b3bc7942982ac2589c942fb345e38bc7a341a f934fb19ef34730263e6afc01e8ec27a8a71470f
Author: Ingo Molnar <mingo at elte.hu>
Date: Mon Jul 28 23:32:00 2008 +0200
Merge branch 'linus' into cpus4096
Conflicts:
kernel/stop_machine.c
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 29111f579f4f3f2a07385f931854ab0527ae7ea5
Merge: cc5499c3a607a392e8a7adb934aaf14b2c6a3519 87e39ea5714dd59ba31e36c25833d2b20255a29d
Author: Jesse Barnes <jbarnes at hobbes.lan>
Date: Mon Jul 28 14:31:10 2008 -0700
Merge branch 'x86/iommu' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into for-linus
commit cc5499c3a607a392e8a7adb934aaf14b2c6a3519
Author: Matthew Wilcox <matthew at wil.cx>
Date: Mon Jul 28 13:39:00 2008 -0400
PCI: handle 64-bit resources better on 32-bit machines
If the kernel is configured to support 64-bit resources on a 32-bit
machine, we can support 64-bit BARs properly. Just change the condition
to check sizeof(resource_size_t) instead of BITS_PER_LONG.
Signed-off-by: Matthew Wilcox <willy at linux.intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit 6ac665c63dcac8fcec534a1d224ecbb8b867ad59
Author: Matthew Wilcox <matthew at wil.cx>
Date: Mon Jul 28 13:38:59 2008 -0400
PCI: rewrite PCI BAR reading code
Factor out the code to read one BAR from the loop in pci_read_bases into
a new function, __pci_read_base. The new code is slightly more
readable, better commented and removes the ifdef.
Signed-off-by: Matthew Wilcox <willy at linux.intel.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit e56b3bc7942982ac2589c942fb345e38bc7a341a
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jul 28 11:32:33 2008 -0700
cpu masks: optimize and clean up cpumask_of_cpu()
Clean up and optimize cpumask_of_cpu(), by sharing all the zero words.
Instead of stupidly generating all possible i=0...NR_CPUS 2^i patterns
creating a huge array of constant bitmasks, realize that the zero words
can be shared.
In other words, on a 64-bit architecture, we only ever need 64 of these
arrays - with a different bit set in one single world (with enough zero
words around it so that we can create any bitmask by just offsetting in
that big array). And then we just put enough zeroes around it that we
can point every single cpumask to be one of those things.
So when we have 4k CPU's, instead of having 4k arrays (of 4k bits each,
with one bit set in each array - 2MB memory total), we have exactly 64
arrays instead, each 8k bits in size (64kB total).
And then we just point cpumask(n) to the right position (which we can
calculate dynamically). Once we have the right arrays, getting
"cpumask(n)" ends up being:
static inline const cpumask_t *get_cpu_mask(unsigned int cpu)
{
const unsigned long *p = cpu_bit_bitmap[1 + cpu % BITS_PER_LONG];
p -= cpu / BITS_PER_LONG;
return (const cpumask_t *)p;
}
This brings other advantages and simplifications as well:
- we are not wasting memory that is just filled with a single bit in
various different places
- we don't need all those games to re-create the arrays in some dense
format, because they're already going to be dense enough.
if we compile a kernel for up to 4k CPU's, "wasting" that 64kB of memory
is a non-issue (especially since by doing this "overlapping" trick we
probably get better cache behaviour anyway).
[ mingo at elte.hu:
Converted Linus's mails into a commit. See:
http://lkml.org/lkml/2008/7/27/156
http://lkml.org/lkml/2008/7/28/320
Also applied a family filter - which also has the side-effect of leaving
out the bits where Linus calls me an idio... Oh, never mind ;-)
]
Signed-off-by: Ingo Molnar <mingo at elte.hu>
Cc: Rusty Russell <rusty at rustcorp.com.au>
Cc: Andrew Morton <akpm at linux-foundation.org>
Cc: Al Viro <viro at ZenIV.linux.org.uk>
Cc: Mike Travis <travis at sgi.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 74deace2f952f7a28d2c516facc9954199881937
Author: Paul Gortmaker <paul.gortmaker at windriver.com>
Date: Mon Jul 28 14:50:31 2008 -0400
Documentation: remove old sbc8260 board specific information
This file contains 8 yr. old board specific information that was for
the now gone ppc implementation, and it pre-dates widespread u-boot
support. Any of the technical details of the board memory map would be
more appropriately captured in a dts if I revive it as powerpc anyway.
Signed-off-by: Paul Gortmaker <paul.gortmaker at windriver.com>
Acked-by: Jason Wessel <jason.wessel at windriver.com>
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
commit 414f746d232d41ed6ae8632c4495ae795373c44b
Merge: 5a7a201c51c324876d00a54e7208af6af12d1ca4 c9272c4f9fbe2087beb3392f526dc5b19efaa56b
Author: Ingo Molnar <mingo at elte.hu>
Date: Mon Jul 28 21:14:43 2008 +0200
Merge branch 'linus' into cpus4096
commit 37139074233a5bbec54ae01ab580e5788a248cc3
Author: Jesse Barnes <jbarnes at hobbes.lan>
Date: Mon Jul 28 11:49:26 2008 -0700
PCI: document pci_target_state
The empty kdoc was causing warnings, so provide some actual documentation.
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit 56adc59d81b01ac5924f7eba6e22adc762a1e2c6
Author: Jesse Barnes <jbarnes at hobbes.lan>
Date: Thu Jul 24 16:43:43 2008 -0700
PCI hotplug: fix typo in pcie hotplug output
Comamnd->Command
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
commit f934fb19ef34730263e6afc01e8ec27a8a71470f
Merge: 3988ba0708e98b4bafc9034aa476775520bee708 72d18a7b9e1a3a9511bae78fc7f0932ae01d5d73
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jul 28 09:59:26 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: add driver for Atmel integrated touchscreen controller
Input: ads7846 - optimize order of calculating Rt in ads7846_rx()
Input: ads7846 - fix sparse endian warnings
Input: uinput - remove duplicate include
Input: serio - offload resume to kseriod
Input: serio - mark serio_register_driver() __must_check
commit 3988ba0708e98b4bafc9034aa476775520bee708
Merge: d9089c296bdd82e6c1b7f82d04c11b5decde75e7 18c60c0a3b16fc7d6a55497a228602ad8509f838
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jul 28 09:46:00 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
dlm: fix uninitialized variable for search_rsb_list callers
dlm: release socket on error
dlm: fix basts for granted CW waiting PR/CW
dlm: check for null in device_write
commit 7f71ac9374fec066e428892a68db158946cee1fb
Author: Ben Dooks <ben-linux at fluff.org>
Date: Mon Jul 28 18:29:09 2008 +0200
mfd: Coding style fixes
Fix some coding style fixes in the mfd core driver.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Signed-off-by: Samuel Ortiz <sameo at openedhand.com>
commit 96ee41993b5b25ee0fbde2d4dcaac1f8c5ef5cc4
Author: Ben Dooks <ben-linux at fluff.org>
Date: Mon Jul 28 18:26:42 2008 +0200
mfd: Use to_platform_device instead of container_of
Convert mfd_remove_devices_fn() to use to_platform_device()
instead of doing container_of().
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Acked-by: Dmitry Baryshkov <dbaryshkov at gmail.com>
Signed-off-by: Samuel Ortiz <sameo at openedhand.com>
commit 0e241ffd306c0896bb9959be7faa4d4cfcb706d9
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Thu Jul 24 16:58:42 2008 -0700
locking: fix mutex @key parameter kernel-doc notation
Fix @key parameter to mutex_init() and one of its callers.
Warning(linux-2.6.26-git11//drivers/base/class.c:210): No description found for parameter 'key'
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Acked-by: Greg Kroah-Hartman <gregkh at suse.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit d9089c296bdd82e6c1b7f82d04c11b5decde75e7
Merge: bda426f5310ffddcd463fe20f352609e84989514 00df438e89a9003895948170e1abf64dd4665872
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jul 28 09:05:35 2008 -0700
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (25 commits)
powerpc: Disable 64K hugetlb support when doing 64K SPU mappings
powerpc/powermac: Fixup default serial port device for pmac_zilog
powerpc/powermac: Use sane default baudrate for SCC debugging
powerpc/mm: Implement _PAGE_SPECIAL & pte_special() for 64-bit
powerpc: Show processor cache information in sysfs
powerpc: Make core id information available to userspace
powerpc: Make core sibling information available to userspace
powerpc/vio: More fallout from dma_mapping_error API change
ibmveth: Fix multiple errors with dma_mapping_error conversion
powerpc/pseries: Fix CMO sysdev attribute API change fallout
powerpc: Enable tracehook for the architecture
powerpc: Add TIF_NOTIFY_RESUME support for tracehook
powerpc: Add asm/syscall.h with the tracehook entry points
powerpc: Make syscall tracing use tracehook.h helpers
powerpc: Call tracehook_signal_handler() when setting up signal frames
powerpc: Update cpu_sibling_maps dynamically
powerpc: register_cpu_online should be __cpuinit
powerpc: kill useless SMT code in prom_hold_cpus
powerpc: Fix 8xx build failure
powerpc: Fix vio build warnings
...
commit bda426f5310ffddcd463fe20f352609e84989514
Merge: b10a8b7238d7b034f28d32a85bb05c48475f132a 7878ac81e69c5b3ccad59808da06edf16455a57a
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jul 28 08:41:56 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6:
Remove deprecated virt_to_bus()
commit b10a8b7238d7b034f28d32a85bb05c48475f132a
Merge: 37eaf8c7463e53cf1acf025fb566fb6c4573297f 8b2224dc6a5b46cfa1d54ab1fe82107351c66443
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jul 28 08:41:13 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (72 commits)
sh: SuperH Mobile CEU and camera platform data for AP325RXA
sh: Update smc911x platform data for AP325RXA
sh: SuperH Mobile LCDC platform data for AP325RXA
sh: Add SuperH Mobile CEU platform data for Migo-R
sh: Add SuperH Mobile LCDC platform data for Migo-R
sh: Move asid_cache() out of ifdef to fix SH-3/4 nommu build.
sh: Workaround for __put_user_asm() bug with gcc 4.x on big-endian.
sh: Wire up new syscalls.
sh: fix uImage Entry Point
sh_keysc: remove request_mem_region() and release_mem_region()
sh: Don't miss pending signals returning to user mode after signal processing
sh: Use clk_always_enable() on sh7366
sh: Use clk_always_enable() on sh7343 / SE77343
sh: Use clk_always_enable() on sh7722 / Migo-R / SE7722
sh: Use clk_always_enable() on sh7723 / ap325rxa
sh: Introduce clk_always_enable() function
sh: Show all clocks and their state in /proc/clocks
sh: Merge sh7343 and sh7722 clock code
sh: Add SuperH Mobile MSTPCR bits to clock framework
sh: Use arch_flags to simplify sh7722 siu clock code
...
commit 37eaf8c7463e53cf1acf025fb566fb6c4573297f
Merge: 58f250714f2bfa3514798fde8b9d38a15e4a9836 784e2d76007f90d69341b95967160c4fb7829299
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jul 28 08:37:46 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: fix up ftrace.c
stop_machine: Wean existing callers off stop_machine_run()
stop_machine(): stop_machine_run() changed to use cpu mask
Hotplug CPU: don't check cpu_online after take_cpu_down
Simplify stop_machine
stop_machine: add ALL_CPUS option
module: fix build warning with !CONFIG_KALLSYMS
commit 58f250714f2bfa3514798fde8b9d38a15e4a9836
Merge: c32f1a34ff1097110469a240ea4539dc9c101e96 c2f90e9536887fb76fb6a2aa239a70fc49beda10
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jul 28 08:35:40 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (98 commits)
V4L/DVB (8549): mxl5007: Fix an error at include file
V4L/DVB (8548): pwc: Fix compilation
V4L/DVB (8546): add tuner-3036 and dpc7146 drivers to feature-removal-schedule.txt
V4L/DVB (8546): saa7146: fix read from uninitialized memory
V4L/DVB (8544): gspca: probe/open race.
V4L/DVB (8543): em28xx: Rename #define for Compro VideoMate ForYou/Stereo
V4L/DVB (8542): em28xx: AMD ATI TV Wonder HD 600 entry at cards struct is duplicated
V4L/DVB (8541): em28xx: HVR-950 entry is duplicated.
V4L/DVB (8540): em28xx-cards: Add Compro VideoMate ForYou/Stereo model
V4L/DVB (8539): em28xx-cards: New supported IDs for analog models
V4L/DVB (8538): em28xx-cards: Add GrabBeeX+ USB2800 model
V4L/DVB (8534): remove select's of FW_LOADER
V4L/DVB (8522): videodev2: Fix merge conflict
V4L/DVB (8532): mxl5007t: remove excessive locks
V4L/DVB (8531): mxl5007t: move i2c gate handling outside of mutex protected code blocks
V4L/DVB (8530): au0828: add support for new revision of HVR950Q
V4L/DVB (8529): mxl5007t: enable _init and _sleep power management functionality
V4L/DVB (8528): add support for MaxLinear MxL5007T silicon tuner
V4L/DVB (8526): saa7146: fix VIDIOC_ENUM_FMT
V4L/DVB (8525): fix a few assorted spelling mistakes.
...
commit c32f1a34ff1097110469a240ea4539dc9c101e96
Merge: 4f31f3080943c7e3541f07df326f06d598a067d0 04d91cb8163f7f946e348b2362a6e5dfa5f06b13
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jul 28 08:33:25 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: Set CONFIG_HAVE_ARCH_TRACEHOOK
sparc: Add task_pt_regs().
sparc: Add call to tracehook_signal_handler().
sparc: Create and use TIF_NOTIFY_RESUME.
sparc: Use tracehook routines in syscall_trace().
sparc64: tracehook: CONFIG_HAVE_ARCH_TRACEHOOK
sparc: Add user_stack_pointer().
sparc64: tracehook_signal_handler
sparc64: tracehook: TIF_NOTIFY_RESUME
sparc: Add asm/syscall.h
sparc64: tracehook syscall
sparc: enable headers_export again
sparc, sparc64: use arch/sparc/include
commit 4f31f3080943c7e3541f07df326f06d598a067d0
Merge: 1486361777b3ce5ead414d9b2d9fc46f9cd86e0b 281c7413ed914623d3245299a4761b6b27ab9fdb
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jul 28 08:32:25 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:
net: missing bits of net-namespace / sysctl
ipcomp: Fix warnings after ipcomp consolidation.
dccp: Add check for truncated ICMPv6 DCCP error packets
dccp: Fix incorrect length check for ICMPv4 packets
dccp: Add check for sequence number in ICMPv6 message
dccp: Fix sequence number check for ICMPv4 packets
dccp: Bug-Fix - AWL was never updated
dccp: Allow to distinguish original and retransmitted packets
commit 1486361777b3ce5ead414d9b2d9fc46f9cd86e0b
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Sun Jul 27 20:44:24 2008 -0700
SubmittingPatches: add git pull & diffstat format info
Add git pull command info and diffstat summary info so that we don't
have to search email archives for it repeatedly.
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1f07be1c31cf898e5e3708d52e38db0803c62924
Author: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Mon Jul 28 11:05:04 2008 +1000
more sysdev API change fallout - drivers/base/memory.c
Noticed because of this warning:
drivers/base/memory.c:279: warning: initialization from incompatible pointer type
Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b032bf70df2e43149ce2b4e9a865b076c6140753
Author: Thomas Gleixner <tglx at linutronix.de>
Date: Sun Jul 27 23:47:12 2008 +0200
ACPI/CPUIDLE: prevent setting pm_idle to NULL
pm_idle_save resp. pm_idle_old can be NULL when the restore code in
acpi_processor_cst_has_changed() resp. cpuidle_uninstall_idle_handler()
is called. This can set pm_idle unconditinally to NULL, which causes the
kernel to panic when calling pm_idle in the x86 idle code. This was
covered by an extra check for !pm_idle in the x86 idle code, which was
removed during the x86 idle code refactoring.
Instead of restoring the pm_idle check in the x86 code prevent the
acpi/cpuidle code to set pm_idle to NULL.
Reported by: Dhaval Giani http://lkml.org/lkml/2008/7/2/309
Based on a debug patch from Ingo Molnar
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9ffc1699e36abd5baee188c8e36b1bb27d0d4278
Merge: a01386924874c4d6d67f8a34e66f04452c2abb69 958585f58f675a3c2855c7d91b6fdd2875552d0b
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Jul 28 08:28:50 2008 -0700
Merge branch 'i2c-for-linus' of git://aeryn.fluff.org.uk/bjdooks/linux
* 'i2c-for-linus' of git://aeryn.fluff.org.uk/bjdooks/linux:
i2c: Blackfin I2C Driver: Functional power management support
i2c: Documentation: upgrading clients HOWTO
i2c: S3C24XX I2C frequency scaling support.
i2c: i2c_gpio: keep probe resident for hotplugged devices.
i2c: S3C2410: Pass the I2C bus number via drivers platform data
commit a01386924874c4d6d67f8a34e66f04452c2abb69
Author: David Sterba <dsterba at suse.cz>
Date: Mon Jul 28 16:53:32 2008 +0200
ipwireless: Preallocate received packet buffers with MRU size
ipwireless: Preallocate received packet buffers with MRU size
Packets are assembled from link size (~300 bytes) up to PPP MRU
(1500 by default). Try to preallocate full size rather than
repeatedly advance buffer size by 256 bytes.
Signed-off-by: David Sterba <dsterba at suse.cz>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0f38c47a545d36da4038fec0708e6e3fbdb160b1
Author: David Sterba <dsterba at suse.cz>
Date: Mon Jul 28 16:53:27 2008 +0200
ipwireless: Put packets to pool start
ipwireless: Put packets to pool start
Put packets to pool start, try to reuse cached memory.
Signed-off-by: David Sterba <dsterba at suse.cz>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit bee9c7c0773517c9f1d7931144fc8dec12233bd7
Author: David Sterba <dsterba at suse.cz>
Date: Mon Jul 28 16:53:21 2008 +0200
ipwireless: Increase PPP outgoing queue size
ipwireless: Increase PPP outgoing queue size
Increase default size of PPP outgoing queue. Currently set to 1, which
means that a packet quickly following another pushed by PPP must wait
until hardware actually sends the previous and PPP has to be waken up
by ppp_wakeup(). This slows down upstream.
Now PPP can push more packets at once which get buffered inside driver
and pushed immediatelly to hardware when previous packet is out.
Experiments show that size = 10 is quite good for all connection types
(GPRS/EDGE/UMTS) and gains 4 KB/sec of upload for UMTS for batch uploads.
Need for higher queue size than 10 occures in only < 0.1 % of cases.
Signed-off-by: David Sterba <dsterba at suse.cz>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 09e491e9a780433f8734eb6efb7293b2da690131
Author: David Sterba <dsterba at suse.cz>
Date: Mon Jul 28 16:53:16 2008 +0200
ipwireless: Explicitly request io and mem regions
ipwireless: Explicitly request io and mem regions
Documentation/pcmcia/driver-changes.txt says, that driver should call request_region
for used memory/io regions since PCMCIA does not do this (since 2.6.8).
Signed-off-by: David Sterba <dsterba at suse.cz>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ff3e990e61a5a9124687a01a025c43b3564f82ab
Author: David Sterba <dsterba at suse.cz>
Date: Mon Jul 28 16:53:11 2008 +0200
ipwireless: Constify buffer variables
ipwireless: Constify buffer variables
Signed-off-by: David Sterba <dsterba at suse.cz>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 93110f698fe92fc4dfd86c78783aedf522c69eb9
Author: David Sterba <dsterba at suse.cz>
Date: Mon Jul 28 16:53:05 2008 +0200
ipwireless: Do not return value from sending funcs
ipwireless: Do not return value from sending funcs
Do not return value from do_send_fragment and do_send_packet, it's not used.
The packet size checks are not useful too:
* zero length packet will never be sent, caller always passes packet_header
size which is either 1 or 3
* MTU check is done in caller, no need to repeat
Signed-off-by: David Sterba <dsterba at suse.cz>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d54c2752f6bb6cc53359dcdf6ed4fb6e5fb6440a
Author: David Sterba <dsterba at suse.cz>
Date: Mon Jul 28 16:53:00 2008 +0200
ipwireless: Remove endian-dependent bitfields
ipwireless: Remove endian-dependent bitfields
Remove endian-dependent bitfields and use bitmasks to transform
packet header bitfields from/to machine order.
Signed-off-by: David Sterba <dsterba at suse.cz>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 622e713e8e207a99aad956bf0ebe435420fb3742
Author: David Sterba <dsterba at suse.cz>
Date: Mon Jul 28 16:52:55 2008 +0200
ipwireless: Glue splitted printk strings back
ipwireless: Glue splitted printk strings back
Signed-off-by: David Sterba <dsterba at suse.cz>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2fc5577e1729ac303ad8b9547f8ccdb057076998
Author: David Sterba <dsterba at suse.cz>
Date: Mon Jul 28 16:52:49 2008 +0200
ipwireless: Remove pt_regs from interrupt handler
ipwireless: Remove pt_regs from interrupt handler
Signed-off-by: David Sterba <dsterba at suse.cz>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 63c4dbd1023b9acd516d71635b06741962cc8a0f
Author: David Sterba <dsterba at suse.cz>
Date: Mon Jul 28 16:52:44 2008 +0200
ipwireless: Rename spinlock variables to lock
ipwireless: Rename spinlock variables to lock
Signed-off-by: David Sterba <dsterba at suse.cz>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2e713165f892c833d240cb265ab35490a7ef456f
Author: David Sterba <dsterba at suse.cz>
Date: Mon Jul 28 16:52:39 2008 +0200
ipwireless: Remove unused defines
ipwireless: Remove unused defines
Remove unused defines, defines hiding variables, defines hiding 0.
Signed-off-by: David Sterba <dsterba at suse.cz>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d4c0deb7009217d5cf7d0fe89255d64ecfad932b
Author: David Sterba <dsterba at suse.cz>
Date: Mon Jul 28 16:52:33 2008 +0200
ipwireless: Misc cleanups
ipwireless: Misc cleanups
- remove likely() and some extra () in ifs
- use unsigned in for loops
- remove useless typecasts
- remove obvious comments
- add () around ?:
Signed-off-by: David Sterba <dsterba at suse.cz>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6ce37a58e334ef773f88283939afc9f4965c7697
Merge: d7ba11d01cfedf63b50391fbe4a05274b6992b43 91467bdf6e53058af13fd255375d6634ba0c70e0
Author: Ingo Molnar <mingo at elte.hu>
Date: Mon Jul 28 17:19:02 2008 +0200
Merge branch 'x86/crashdump' into x86/urgent
commit 00eabe7c4478f38b42d632763c4878ced5a1f25c
Author: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Date: Mon Jul 28 11:59:20 2008 +0900
[SCSI] qla2xxx: fix msleep compile error
drivers/scsi/qla2xxx/qla_attr.c: In function 'qla24xx_vport_delete':
drivers/scsi/qla2xxx/qla_attr.c:1184: error: implicit declaration of function 'msleep'
make[3]: *** [drivers/scsi/qla2xxx/qla_attr.o] Error 1
make[3]: *** Waiting for unfinished jobs....
Reported-by: David Miller <davem at davemloft.net>
Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Acked-by: Andrew Vasquez <andrew.vasquez at qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit dddb8d311157d054da5441385f681b8cc0e5a94b
Author: Laurent Pinchart <laurentp at cse-semaphore.com>
Date: Tue Jul 22 18:00:43 2008 +0200
cpm2: Rework baud rate generators configuration to support external clocks.
The CPM2 BRG setup functions cpm_setbrg and cpm2_fastbrg don't support
external clocks. This patch adds a new exported __cpm2_setbrg function
that takes the clock rate and clock source as extra parameters, and moves
cpm_setbrg and cpm2_fastbrg to include/asm-powerpc/cpm2.h where they
become inline wrappers around __cpm2_setbrg.
Signed-off-by: Laurent Pinchart <laurentp at cse-semaphore.com>
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
commit e517881e427757afc3cce6d76173b1d898b30ab3
Author: Anton Vorontsov <avorontsov at ru.mvista.com>
Date: Thu Jun 12 03:04:31 2008 +0400
powerpc: rtc_cmos_setup: assign interrupts only if there is i8259 PIC
i8259 PIC is disabled on MPC8610HPCD boards, thus currently rtc-cmos
driver fails to probe.
To fix the issue, we lookup the device tree for "chrp,iic" and
"pnpPNP,000" compatible devices, and if not found we do not assign RTC
IRQ and assuming that i8259 was disabled.
Though this patch fixes RTC on some boards (and surely should not break
any other), the whole approach is still broken. We can't easily fix this
though, because old device trees do not specify i8259 interrupts for the
cmos rtc node.
Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
commit 80776554b6c93cf828ddc702010c6a189aa0d0e9
Author: Laurent Pinchart <laurentp at cse-semaphore.com>
Date: Mon Jul 28 10:42:16 2008 +0200
cpm_uart: Add generic clock API support to set baudrates
This patch introduces baudrate setting support via the generic clock API.
When present the optional device tree clock property is used instead of
fsl-cpm-brg. Platforms can then define complex clock schemes, to output
the serial clock on an external pin for instance.
Signed-off-by: Laurent Pinchart <laurentp at cse-semaphore.com>
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
commit 7485d26b7e13ee8ff82adb271ac90a996c1fe830
Author: Laurent Pinchart <laurentp at cse-semaphore.com>
Date: Thu Jul 24 18:36:37 2008 +0200
cpm_uart: Modem control lines support
This patch replaces the get_mctrl/set_mctrl stubs with modem control line
read/write access through the GPIO lib.
Available modem control lines are described in the device tree using GPIO
bindings. The driver expect a GPIO pin for each of the CTS, RTS, DCD, DSR,
DTR and RI signals. Unused control lines can be left out.
Signed-off-by: Laurent Pinchart <laurentp at cse-semaphore.com>
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
commit dc2380ec8572fcd7f7e9579afc9fb223300d922f
Author: Jochen Friedrich <jochen at scram.de>
Date: Thu Jul 3 02:18:23 2008 +1000
powerpc: implement GPIO LIB API on CPM1 Freescale SoC.
This patch implement GPIO LIB support for the CPM1 GPIOs.
Signed-off-by: Jochen Friedrich <jochen at scram.de>
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
commit e193325e3e3de188ae2aa5207adc7129aacc5c9d
Author: Laurent Pinchart <laurentp at cse-semaphore.com>
Date: Mon Jul 28 10:43:22 2008 +0200
cpm2: Implement GPIO LIB API on CPM2 Freescale SoC.
This patch implement GPIO LIB support for the CPM2 GPIOs. The code can
also be used for CPM1 GPIO port E, as both cores are compatible at the
register level.
Based on earlier work by Laurent Pinchart.
Signed-off-by: Jochen Friedrich <jochen at scram.de>
Cc: Laurent Pinchart <laurentp at cse-semaphore.com>
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
commit d7ba11d01cfedf63b50391fbe4a05274b6992b43
Author: Joe Perches <joe at perches.com>
Date: Sun Jul 27 12:02:04 2008 -0700
x86: remove stray <6> in BogoMIPS printk
Rabin Vincent noticed that there's a stray <6> in BogoMIPS printk:
> Remove the extra KERN_INFO which causes this:
> Calibrating delay loop... <6>179.40 BogoMIPS (lpj=897024)
> - printk(KERN_INFO "%lu.%02lu BogoMIPS (lpj=%lu)\n",
> - loops_per_jiffy/(500000/HZ),
> - (loops_per_jiffy/(5000/HZ)) % 100, loops_per_jiffy);
> + printk("%lu.%02lu BogoMIPS (lpj=%lu)\n",
> + loops_per_jiffy/(500000/HZ),
> + (loops_per_jiffy/(5000/HZ)) % 100, loops_per_jiffy);
> }
How about just using KERN_CONT and leaving the whitespace
for a patch that does the entire file?
Reported-by: Rabin Vincent <rabin at rab.in>
commit 958585f58f675a3c2855c7d91b6fdd2875552d0b
Author: Michael Hennerich <michael.hennerich at analog.com>
Date: Sun Jul 27 14:41:54 2008 +0800
i2c: Blackfin I2C Driver: Functional power management support
PM_SUSPEND_MEM: Blackfin does not maintain register state through
Hibernate. Save and restore peripheral base initialization during
PM transitions.
Signed-off-by: Michael Hennerich <michael.hennerich at analog.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
commit 31321b76e1a2c70f4eb4c0e19f9f860dcd0ef2ce
Author: Ben Dooks <ben-linux at fluff.org>
Date: Mon Jul 28 12:04:08 2008 +0100
i2c: Documentation: upgrading clients HOWTO
Add a document describing how i2c clients on Linux 2.6 can be
moved from the old to the new driver model.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
commit 61c7cff89224fc5651b5ba5ff2185d19304b2484
Author: Ben Dooks <ben-linux at fluff.org>
Date: Mon Jul 28 12:04:07 2008 +0100
i2c: S3C24XX I2C frequency scaling support.
Add support for CPU frequency scaling to the S3C24XX I2C driver.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
commit 1efe7c55d2c4acc6c1d1c1a68bd9070f13815272
Author: Ben Dooks <ben-linux at fluff.org>
Date: Mon Jul 28 12:04:09 2008 +0100
i2c: i2c_gpio: keep probe resident for hotplugged devices.
